From f973708a7dae9fd05f0d76584b9241a2184e1b84 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 18 Dec 2024 17:38:43 +0100 Subject: [PATCH 01/10] Refactor repo-projects.ts --- web_src/js/features/repo-projects.ts | 72 +++++++++++++--------------- web_src/js/modules/sortable.ts | 3 +- 2 files changed, 34 insertions(+), 41 deletions(-) diff --git a/web_src/js/features/repo-projects.ts b/web_src/js/features/repo-projects.ts index d1f0d17c4469a..9f75bb26f4a3e 100644 --- a/web_src/js/features/repo-projects.ts +++ b/web_src/js/features/repo-projects.ts @@ -1,31 +1,31 @@ -import $ from 'jquery'; import {contrastColor} from '../utils/color.ts'; import {createSortable} from '../modules/sortable.ts'; import {POST, DELETE, PUT} from '../modules/fetch.ts'; +import {fomanticQuery} from '../modules/fomantic/base.ts'; -function updateIssueCount(cards) { - const parent = cards.parentElement; +function updateIssueCount(card: HTMLElement): void { + const parent = card.parentElement; const cnt = parent.querySelectorAll('.issue-card').length; - parent.querySelectorAll('.project-column-issue-count')[0].textContent = cnt; + parent.querySelectorAll('.project-column-issue-count')[0].textContent = String(cnt); } -async function createNewColumn(url, columnTitle, projectColorInput) { +async function createNewColumn(url: string, columnTitleInput: HTMLInputElement, projectColorInput: HTMLInputElement): Promise { try { await POST(url, { data: { - title: columnTitle.val(), - color: projectColorInput.val(), + title: columnTitleInput.value, + color: projectColorInput.value, }, }); } catch (error) { console.error(error); } finally { - columnTitle.closest('form').removeClass('dirty'); + columnTitleInput.closest('form').classList.remove('dirty'); window.location.reload(); } } -async function moveIssue({item, from, to, oldIndex}: {item: HTMLElement, from: HTMLElement, to: HTMLElement, oldIndex: number}) { +async function moveIssue({item, from, to, oldIndex}: {item: HTMLElement, from: HTMLElement, to: HTMLElement, oldIndex: number}): Promise { const columnCards = to.querySelectorAll('.issue-card'); updateIssueCount(from); updateIssueCount(to); @@ -47,13 +47,13 @@ async function moveIssue({item, from, to, oldIndex}: {item: HTMLElement, from: H } } -async function initRepoProjectSortable() { +async function initRepoProjectSortable(): Promise { const els = document.querySelectorAll('#project-board > .board.sortable'); if (!els.length) return; // the HTML layout is: #project-board > .board > .project-column .cards > .issue-card const mainBoard = els[0]; - let boardColumns = mainBoard.querySelectorAll('.project-column'); + let boardColumns = mainBoard.querySelectorAll('.project-column'); createSortable(mainBoard, { group: 'project-column', draggable: '.project-column', @@ -61,7 +61,7 @@ async function initRepoProjectSortable() { delayOnTouchOnly: true, delay: 500, onSort: async () => { // eslint-disable-line @typescript-eslint/no-misused-promises - boardColumns = mainBoard.querySelectorAll('.project-column'); + boardColumns = mainBoard.querySelectorAll('.project-column'); const columnSorting = { columns: Array.from(boardColumns, (column, i) => ({ @@ -92,14 +92,14 @@ async function initRepoProjectSortable() { } } -export function initRepoProject() { +export function initRepoProject(): void { if (!document.querySelector('.repository.projects')) { return; } initRepoProjectSortable(); // no await - for (const modal of document.querySelectorAll('.edit-project-column-modal')) { + for (const modal of document.querySelectorAll('.edit-project-column-modal')) { const projectHeader = modal.closest('.project-column-header'); const projectTitleLabel = projectHeader?.querySelector('.project-column-title-label'); const projectTitleInput = modal.querySelector('.project-column-title-input'); @@ -134,55 +134,47 @@ export function initRepoProject() { divider.style.removeProperty('color'); } } - $('.ui.modal').modal('hide'); + fomanticQuery('.ui.modal').modal('hide'); } }); } - $('.default-project-column-modal').each(function () { - const $boardColumn = $(this).closest('.project-column'); - const $showButton = $($boardColumn).find('.default-project-column-show'); - const $commitButton = $(this).find('.actions > .ok.button'); - - $($commitButton).on('click', async (e) => { + for (const modal of document.querySelectorAll('.default-project-column-modal')) { + const column = modal.closest('.project-column'); + const showBtn = column.querySelector('.default-project-column-show'); + const okBtn = modal.querySelector('.actions .ok.button'); + okBtn.addEventListener('click', async (e: MouseEvent) => { e.preventDefault(); - try { - await POST($($showButton).data('url')); + await POST(showBtn.getAttribute('data-url')); } catch (error) { console.error(error); } finally { window.location.reload(); } }); - }); - - $('.show-delete-project-column-modal').each(function () { - const $deleteColumnModal = $(`${this.getAttribute('data-modal')}`); - const $deleteColumnButton = $deleteColumnModal.find('.actions > .ok.button'); - const deleteUrl = this.getAttribute('data-url'); + } - $deleteColumnButton.on('click', async (e) => { + for (const btn of document.querySelectorAll('.show-delete-project-column-modal')) { + const okBtn = document.querySelector(`${btn.getAttribute('data-modal')} .actions .ok.button`); + okBtn?.addEventListener('click', async (e: MouseEvent) => { e.preventDefault(); - try { - await DELETE(deleteUrl); + await DELETE(btn.getAttribute('data-url')); } catch (error) { console.error(error); } finally { window.location.reload(); } }); - }); + } - $('#new_project_column_submit').on('click', (e) => { + document.querySelector('#new_project_column_submit')?.addEventListener('click', async (e: MouseEvent & {target: HTMLButtonElement}) => { e.preventDefault(); - const $columnTitle = $('#new_project_column'); - const $projectColorInput = $('#new_project_column_color_picker'); - if (!$columnTitle.val()) { - return; - } + const columnTitleInput = document.querySelector('#new_project_column'); + const projectColorInput = document.querySelector('#new_project_column_color_picker'); + if (!columnTitleInput.value) return; const url = e.target.getAttribute('data-url'); - createNewColumn(url, $columnTitle, $projectColorInput); + await createNewColumn(url, columnTitleInput, projectColorInput); }); } diff --git a/web_src/js/modules/sortable.ts b/web_src/js/modules/sortable.ts index b318386d08e01..ce5a0dc3c49c3 100644 --- a/web_src/js/modules/sortable.ts +++ b/web_src/js/modules/sortable.ts @@ -1,6 +1,7 @@ import type {SortableOptions, SortableEvent} from 'sortablejs'; +import type Sortable from 'sortablejs'; -export async function createSortable(el: Element, opts: {handle?: string} & SortableOptions = {}) { +export async function createSortable(el: Element, opts: {handle?: string} & SortableOptions = {}): Promise { // @ts-expect-error: wrong type derived by typescript const {Sortable} = await import(/* webpackChunkName: "sortablejs" */'sortablejs'); From 89f4a59a24654ce05d378e27ca730f91b9727f56 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 18 Dec 2024 17:47:14 +0100 Subject: [PATCH 02/10] fix tsc --- web_src/js/features/repo-settings-branches.test.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web_src/js/features/repo-settings-branches.test.ts b/web_src/js/features/repo-settings-branches.test.ts index 32ab54e4c2c02..44f17e8b48455 100644 --- a/web_src/js/features/repo-settings-branches.test.ts +++ b/web_src/js/features/repo-settings-branches.test.ts @@ -3,6 +3,7 @@ import {initRepoSettingsBranchesDrag} from './repo-settings-branches.ts'; import {POST} from '../modules/fetch.ts'; import {createSortable} from '../modules/sortable.ts'; import type {SortableEvent} from 'sortablejs'; +import type Sortable from 'sortablejs'; vi.mock('../modules/fetch.ts', () => ({ POST: vi.fn(), @@ -57,7 +58,8 @@ describe('Repository Branch Settings', () => { // Mock createSortable to capture and execute the onEnd callback vi.mocked(createSortable).mockImplementation(async (_el: Element, options) => { options.onEnd(new Event('SortableEvent') as SortableEvent); - return {destroy: vi.fn()}; + // @ts-expect-error: mock is incomplete + return {destroy: vi.fn()} as Sortable; }); initRepoSettingsBranchesDrag(); From 123d20c8d86c9f8c5707461a0e0a4cfaf08cbe26 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 18 Dec 2024 17:48:51 +0100 Subject: [PATCH 03/10] add type --- web_src/js/features/repo-settings-branches.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/js/features/repo-settings-branches.test.ts b/web_src/js/features/repo-settings-branches.test.ts index 44f17e8b48455..526e279723c99 100644 --- a/web_src/js/features/repo-settings-branches.test.ts +++ b/web_src/js/features/repo-settings-branches.test.ts @@ -2,7 +2,7 @@ import {beforeEach, describe, expect, test, vi} from 'vitest'; import {initRepoSettingsBranchesDrag} from './repo-settings-branches.ts'; import {POST} from '../modules/fetch.ts'; import {createSortable} from '../modules/sortable.ts'; -import type {SortableEvent} from 'sortablejs'; +import type {SortableEvent, SortableOptions} from 'sortablejs'; import type Sortable from 'sortablejs'; vi.mock('../modules/fetch.ts', () => ({ @@ -56,7 +56,7 @@ describe('Repository Branch Settings', () => { vi.mocked(POST).mockResolvedValue({ok: true} as Response); // Mock createSortable to capture and execute the onEnd callback - vi.mocked(createSortable).mockImplementation(async (_el: Element, options) => { + vi.mocked(createSortable).mockImplementation(async (_el: Element, options: SortableOptions) => { options.onEnd(new Event('SortableEvent') as SortableEvent); // @ts-expect-error: mock is incomplete return {destroy: vi.fn()} as Sortable; From 8e444d99ee450da49f45dba0cf1a05de20b777dd Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 19 Dec 2024 11:37:18 +0800 Subject: [PATCH 04/10] clean up fragile code --- templates/projects/view.tmpl | 2 +- web_src/js/features/repo-projects.ts | 27 +++++++++++---------------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index 966d3bf60445b..dbeb0d0096bb5 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -80,7 +80,7 @@
-
+
{{range .Columns}}
diff --git a/web_src/js/features/repo-projects.ts b/web_src/js/features/repo-projects.ts index 9f75bb26f4a3e..234898674edbf 100644 --- a/web_src/js/features/repo-projects.ts +++ b/web_src/js/features/repo-projects.ts @@ -6,7 +6,7 @@ import {fomanticQuery} from '../modules/fomantic/base.ts'; function updateIssueCount(card: HTMLElement): void { const parent = card.parentElement; const cnt = parent.querySelectorAll('.issue-card').length; - parent.querySelectorAll('.project-column-issue-count')[0].textContent = String(cnt); + parent.querySelector('.project-column-issue-count').textContent = String(cnt); } async function createNewColumn(url: string, columnTitleInput: HTMLInputElement, projectColorInput: HTMLInputElement): Promise { @@ -48,11 +48,8 @@ async function moveIssue({item, from, to, oldIndex}: {item: HTMLElement, from: H } async function initRepoProjectSortable(): Promise { - const els = document.querySelectorAll('#project-board > .board.sortable'); - if (!els.length) return; - // the HTML layout is: #project-board > .board > .project-column .cards > .issue-card - const mainBoard = els[0]; + const mainBoard = document.querySelector('#project-board > .board.sortable'); let boardColumns = mainBoard.querySelectorAll('.project-column'); createSortable(mainBoard, { group: 'project-column', @@ -93,32 +90,30 @@ async function initRepoProjectSortable(): Promise { } export function initRepoProject(): void { - if (!document.querySelector('.repository.projects')) { - return; - } + if (!document.querySelector('#project-board[data-project-borad-writable="true"]')) return; initRepoProjectSortable(); // no await for (const modal of document.querySelectorAll('.edit-project-column-modal')) { const projectHeader = modal.closest('.project-column-header'); - const projectTitleLabel = projectHeader?.querySelector('.project-column-title-label'); + const projectTitleLabel = projectHeader.querySelector('.project-column-title-label'); const projectTitleInput = modal.querySelector('.project-column-title-input'); const projectColorInput = modal.querySelector('#new_project_column_color'); const boardColumn = modal.closest('.project-column'); - modal.querySelector('.edit-project-column-button')?.addEventListener('click', async function (e) { + modal.querySelector('.edit-project-column-button').addEventListener('click', async function (e) { e.preventDefault(); try { await PUT(this.getAttribute('data-url'), { data: { - title: projectTitleInput?.value, - color: projectColorInput?.value, + title: projectTitleInput.value, + color: projectColorInput.value, }, }); } catch (error) { console.error(error); } finally { - projectTitleLabel.textContent = projectTitleInput?.value; - projectTitleInput.closest('form')?.classList.remove('dirty'); + projectTitleLabel.textContent = projectTitleInput.value; + projectTitleInput.closest('form').classList.remove('dirty'); const dividers = boardColumn.querySelectorAll(':scope > .divider'); if (projectColorInput.value) { const color = contrastColor(projectColorInput.value); @@ -157,7 +152,7 @@ export function initRepoProject(): void { for (const btn of document.querySelectorAll('.show-delete-project-column-modal')) { const okBtn = document.querySelector(`${btn.getAttribute('data-modal')} .actions .ok.button`); - okBtn?.addEventListener('click', async (e: MouseEvent) => { + okBtn.addEventListener('click', async (e: MouseEvent) => { e.preventDefault(); try { await DELETE(btn.getAttribute('data-url')); @@ -169,7 +164,7 @@ export function initRepoProject(): void { }); } - document.querySelector('#new_project_column_submit')?.addEventListener('click', async (e: MouseEvent & {target: HTMLButtonElement}) => { + document.querySelector('#new_project_column_submit').addEventListener('click', async (e: MouseEvent & {target: HTMLButtonElement}) => { e.preventDefault(); const columnTitleInput = document.querySelector('#new_project_column'); const projectColorInput = document.querySelector('#new_project_column_color_picker'); From 20a6567f46595bd6aa169b6e27db49cc02048a8e Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 19 Dec 2024 13:04:38 +0800 Subject: [PATCH 05/10] fix --- routers/web/web.go | 10 +- templates/projects/view.tmpl | 157 ++++++------------ .../repo/issue/labels/label_edit_modal.tmpl | 2 +- web_src/css/features/projects.css | 4 - web_src/js/features/common-fetch-action.ts | 2 +- web_src/js/features/repo-projects.ts | 147 +++++++--------- 6 files changed, 119 insertions(+), 203 deletions(-) diff --git a/routers/web/web.go b/routers/web/web.go index 72ee47bb4c962..aa37d4dc10528 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -1020,14 +1020,15 @@ func registerRoutes(m *web.Router) { m.Get("/new", org.RenderNewProject) m.Post("/new", web.Bind(forms.CreateProjectForm{}), org.NewProjectPost) m.Group("/{id}", func() { - m.Post("", web.Bind(forms.EditProjectColumnForm{}), org.AddColumnToProjectPost) - m.Post("/move", project.MoveColumns) m.Post("/delete", org.DeleteProject) m.Get("/edit", org.RenderEditProject) m.Post("/edit", web.Bind(forms.CreateProjectForm{}), org.EditProjectPost) m.Post("/{action:open|close}", org.ChangeProjectStatus) + // TODO: improper name. Others are "delete project", "edit project", but this one is "move columns" + m.Post("/move", project.MoveColumns) + m.Post("/columns/new", web.Bind(forms.EditProjectColumnForm{}), org.AddColumnToProjectPost) m.Group("/{columnID}", func() { m.Put("", web.Bind(forms.EditProjectColumnForm{}), org.EditProjectColumn) m.Delete("", org.DeleteProjectColumn) @@ -1387,14 +1388,15 @@ func registerRoutes(m *web.Router) { m.Get("/new", repo.RenderNewProject) m.Post("/new", web.Bind(forms.CreateProjectForm{}), repo.NewProjectPost) m.Group("/{id}", func() { - m.Post("", web.Bind(forms.EditProjectColumnForm{}), repo.AddColumnToProjectPost) - m.Post("/move", project.MoveColumns) m.Post("/delete", repo.DeleteProject) m.Get("/edit", repo.RenderEditProject) m.Post("/edit", web.Bind(forms.CreateProjectForm{}), repo.EditProjectPost) m.Post("/{action:open|close}", repo.ChangeProjectStatus) + // TODO: improper name. Others are "delete project", "edit project", but this one is "move columns" + m.Post("/move", project.MoveColumns) + m.Post("/columns/new", web.Bind(forms.EditProjectColumnForm{}), repo.AddColumnToProjectPost) m.Group("/{columnID}", func() { m.Put("", web.Bind(forms.EditProjectColumnForm{}), repo.EditProjectColumn) m.Delete("", repo.DeleteProjectColumn) diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index dbeb0d0096bb5..e3c86dad58024 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -41,37 +41,18 @@ {{svg "octicon-trash"}} {{ctx.Locale.Tr "repo.issues.label_delete"}} -
- {{end}}
@@ -81,87 +62,42 @@
-
+
{{range .Columns}} -
+
{{.NumIssues ctx}}
-
{{.Title}}
+
{{.Title}}
{{if $canWriteProject}}
{{svg "octicon-kebab-horizontal"}}
- - {{svg "octicon-pencil"}} - {{ctx.Locale.Tr "repo.projects.column.edit"}} + + {{svg "octicon-pencil"}} {{ctx.Locale.Tr "repo.projects.column.edit"}} {{if not .Default}} - - {{svg "octicon-pin"}} - {{ctx.Locale.Tr "repo.projects.column.set_default"}} + + {{svg "octicon-pin"}} {{ctx.Locale.Tr "repo.projects.column.set_default"}} - - {{svg "octicon-trash"}} - {{ctx.Locale.Tr "repo.projects.column.delete"}} + + {{svg "octicon-trash"}} {{ctx.Locale.Tr "repo.projects.column.delete"}} {{end}} - - - - - -
{{end}} @@ -179,15 +115,28 @@
-{{if .CanWriteProjects}} -
-
- {{svg "octicon-trash"}} - {{ctx.Locale.Tr "repo.projects.deletion"}} -
-
-

{{ctx.Locale.Tr "repo.projects.deletion_desc"}}

-
- {{template "base/modal_actions_confirm" .}} +{{if $canWriteProject}} + {{end}} diff --git a/templates/repo/issue/labels/label_edit_modal.tmpl b/templates/repo/issue/labels/label_edit_modal.tmpl index f04d499737aba..527b7ff900caf 100644 --- a/templates/repo/issue/labels/label_edit_modal.tmpl +++ b/templates/repo/issue/labels/label_edit_modal.tmpl @@ -41,7 +41,7 @@
-
+
diff --git a/web_src/css/features/projects.css b/web_src/css/features/projects.css index 9d462c4c4abb9..8763d3684eb42 100644 --- a/web_src/css/features/projects.css +++ b/web_src/css/features/projects.css @@ -51,10 +51,6 @@ color: inherit; } -.project-column-title-label { - flex: 1; -} - .project-column > .cards { flex: 1; display: flex; diff --git a/web_src/js/features/common-fetch-action.ts b/web_src/js/features/common-fetch-action.ts index a6901756f6828..1a5b38e3e57a0 100644 --- a/web_src/js/features/common-fetch-action.ts +++ b/web_src/js/features/common-fetch-action.ts @@ -100,7 +100,7 @@ async function linkAction(el: HTMLElement, e: Event) { const url = el.getAttribute('data-url'); const doRequest = async () => { if ('disabled' in el) el.disabled = true; // el could be A or BUTTON, but A doesn't have disabled attribute - await fetchActionDoRequest(el, url, {method: 'POST'}); + await fetchActionDoRequest(el, url, {method: el.getAttribute('data-link-action-method') || 'POST'}); if ('disabled' in el) el.disabled = false; }; diff --git a/web_src/js/features/repo-projects.ts b/web_src/js/features/repo-projects.ts index 234898674edbf..d3b02800c455f 100644 --- a/web_src/js/features/repo-projects.ts +++ b/web_src/js/features/repo-projects.ts @@ -1,7 +1,8 @@ import {contrastColor} from '../utils/color.ts'; import {createSortable} from '../modules/sortable.ts'; -import {POST, DELETE, PUT} from '../modules/fetch.ts'; +import {POST, request} from '../modules/fetch.ts'; import {fomanticQuery} from '../modules/fomantic/base.ts'; +import {queryElemChildren, queryElems} from '../utils/dom.ts'; function updateIssueCount(card: HTMLElement): void { const parent = card.parentElement; @@ -9,22 +10,6 @@ function updateIssueCount(card: HTMLElement): void { parent.querySelector('.project-column-issue-count').textContent = String(cnt); } -async function createNewColumn(url: string, columnTitleInput: HTMLInputElement, projectColorInput: HTMLInputElement): Promise { - try { - await POST(url, { - data: { - title: columnTitleInput.value, - color: projectColorInput.value, - }, - }); - } catch (error) { - console.error(error); - } finally { - columnTitleInput.closest('form').classList.remove('dirty'); - window.location.reload(); - } -} - async function moveIssue({item, from, to, oldIndex}: {item: HTMLElement, from: HTMLElement, to: HTMLElement, oldIndex: number}): Promise { const columnCards = to.querySelectorAll('.issue-card'); updateIssueCount(from); @@ -90,86 +75,70 @@ async function initRepoProjectSortable(): Promise { } export function initRepoProject(): void { - if (!document.querySelector('#project-board[data-project-borad-writable="true"]')) return; + const writableProjectBoard = document.querySelector('#project-board[data-project-borad-writable="true"]'); + if (!writableProjectBoard) return; initRepoProjectSortable(); // no await - for (const modal of document.querySelectorAll('.edit-project-column-modal')) { - const projectHeader = modal.closest('.project-column-header'); - const projectTitleLabel = projectHeader.querySelector('.project-column-title-label'); - const projectTitleInput = modal.querySelector('.project-column-title-input'); - const projectColorInput = modal.querySelector('#new_project_column_color'); - const boardColumn = modal.closest('.project-column'); - modal.querySelector('.edit-project-column-button').addEventListener('click', async function (e) { - e.preventDefault(); - try { - await PUT(this.getAttribute('data-url'), { - data: { - title: projectTitleInput.value, - color: projectColorInput.value, - }, - }); - } catch (error) { - console.error(error); - } finally { - projectTitleLabel.textContent = projectTitleInput.value; - projectTitleInput.closest('form').classList.remove('dirty'); - const dividers = boardColumn.querySelectorAll(':scope > .divider'); - if (projectColorInput.value) { - const color = contrastColor(projectColorInput.value); - boardColumn.style.setProperty('background', projectColorInput.value, 'important'); - boardColumn.style.setProperty('color', color, 'important'); - for (const divider of dividers) { - divider.style.setProperty('color', color); - } - } else { - boardColumn.style.removeProperty('background'); - boardColumn.style.removeProperty('color'); - for (const divider of dividers) { - divider.style.removeProperty('color'); - } - } - fomanticQuery('.ui.modal').modal('hide'); - } - }); - } + const elColumnEditModal = document.querySelector('.ui.modal#project-column-modal-edit'); + const elColumnEditForm = elColumnEditModal.querySelector('form'); - for (const modal of document.querySelectorAll('.default-project-column-modal')) { - const column = modal.closest('.project-column'); - const showBtn = column.querySelector('.default-project-column-show'); - const okBtn = modal.querySelector('.actions .ok.button'); - okBtn.addEventListener('click', async (e: MouseEvent) => { - e.preventDefault(); - try { - await POST(showBtn.getAttribute('data-url')); - } catch (error) { - console.error(error); - } finally { - window.location.reload(); - } + const elColumnEditId = elColumnEditForm.querySelector('input[name="id"]'); + const elColumnEditTitle = elColumnEditForm.querySelector('input[name="title"]'); + const elColumnEditColor = elColumnEditForm.querySelector('input[name="color"]'); + + const dataAttrColumnId = 'data-modal-project-column-id'; + const dataAttrColumnTitle = 'data-modal-project-column-title-input'; + const dataAttrColumnColor = 'data-modal-project-column-color-input'; + + // the "new" button is not in project board, so need to query from document + queryElems(document, '.show-project-column-modal-edit', (el) => { + el.addEventListener('click', () => { + elColumnEditId.value = el.getAttribute(dataAttrColumnId); + elColumnEditTitle.value = el.getAttribute(dataAttrColumnTitle); + elColumnEditColor.value = el.getAttribute(dataAttrColumnColor); + elColumnEditColor.dispatchEvent(new Event('input', {bubbles: true})); // trigger the color picker }); - } + }); - for (const btn of document.querySelectorAll('.show-delete-project-column-modal')) { - const okBtn = document.querySelector(`${btn.getAttribute('data-modal')} .actions .ok.button`); - okBtn.addEventListener('click', async (e: MouseEvent) => { - e.preventDefault(); - try { - await DELETE(btn.getAttribute('data-url')); - } catch (error) { - console.error(error); - } finally { + elColumnEditForm.addEventListener('submit', async (e) => { + e.preventDefault(); + const columnId = elColumnEditId.value; + const actionBaseLink = elColumnEditForm.getAttribute('data-action-base-link'); + + const formData = new FormData(elColumnEditForm); + const formLink = columnId ? `${actionBaseLink}/${columnId}` : `${actionBaseLink}/columns/new`; + const formMethod = columnId ? 'PUT' : 'POST'; + + try { + elColumnEditForm.classList.add('is-loading'); + await request(formLink, {method: formMethod, data: formData}); + if (!columnId) { window.location.reload(); + return; } - }); - } - document.querySelector('#new_project_column_submit').addEventListener('click', async (e: MouseEvent & {target: HTMLButtonElement}) => { - e.preventDefault(); - const columnTitleInput = document.querySelector('#new_project_column'); - const projectColorInput = document.querySelector('#new_project_column_color_picker'); - if (!columnTitleInput.value) return; - const url = e.target.getAttribute('data-url'); - await createNewColumn(url, columnTitleInput, projectColorInput); + // update the newly saved column title and color in the project board (to avoid reload) + const elEditButton = writableProjectBoard.querySelector(`.show-project-column-modal-edit[${dataAttrColumnId}="${columnId}"]`); + elEditButton.setAttribute(dataAttrColumnTitle, elColumnEditTitle.value); + elEditButton.setAttribute(dataAttrColumnColor, elColumnEditColor.value); + + const elBoardColumn = writableProjectBoard.querySelector(`.project-column[data-id="${columnId}"]`); + const elBoardColumnTitle = elBoardColumn.querySelector(`.project-column-title-text`); + elBoardColumnTitle.textContent = elColumnEditTitle.value; + if (elColumnEditColor.value) { + const textColor = contrastColor(elColumnEditColor.value); + elBoardColumn.style.setProperty('background', elColumnEditColor.value, 'important'); + elBoardColumn.style.setProperty('color', textColor, 'important'); + queryElemChildren(elBoardColumn, '.divider', (divider) => divider.style.color = textColor); + } else { + elBoardColumn.style.removeProperty('background'); + elBoardColumn.style.removeProperty('color'); + queryElemChildren(elBoardColumn, '.divider', (divider) => divider.style.removeProperty('color')); + } + fomanticQuery(elColumnEditModal).modal('hide'); + } finally { + elColumnEditForm.classList.remove('is-loading'); + } }); } From 5d24808a8b7e485ef623f49c6b4fa84f6c529595 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 19 Dec 2024 13:10:36 +0800 Subject: [PATCH 06/10] fix delete btn --- templates/projects/view.tmpl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index e3c86dad58024..2550cae69c2bc 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -37,7 +37,10 @@ {{ctx.Locale.Tr "repo.projects.close"}} {{end}} - @@ -92,8 +95,8 @@ {{svg "octicon-pin"}} {{ctx.Locale.Tr "repo.projects.column.set_default"}} {{svg "octicon-trash"}} {{ctx.Locale.Tr "repo.projects.column.delete"}} From 7502ec4f7f8f60f1eb6418435e81d4fc51d71d02 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 19 Dec 2024 13:21:25 +0800 Subject: [PATCH 07/10] split init function --- web_src/js/features/repo-projects.ts | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/web_src/js/features/repo-projects.ts b/web_src/js/features/repo-projects.ts index d3b02800c455f..0b09ec730832c 100644 --- a/web_src/js/features/repo-projects.ts +++ b/web_src/js/features/repo-projects.ts @@ -63,7 +63,7 @@ async function initRepoProjectSortable(): Promise { }); for (const boardColumn of boardColumns) { - const boardCardList = boardColumn.querySelectorAll('.cards')[0]; + const boardCardList = boardColumn.querySelector('.cards'); createSortable(boardCardList, { group: 'shared', onAdd: moveIssue, // eslint-disable-line @typescript-eslint/no-misused-promises @@ -74,12 +74,7 @@ async function initRepoProjectSortable(): Promise { } } -export function initRepoProject(): void { - const writableProjectBoard = document.querySelector('#project-board[data-project-borad-writable="true"]'); - if (!writableProjectBoard) return; - - initRepoProjectSortable(); // no await - +function initRepoProjectColumnEdit(writableProjectBoard: Element): void { const elColumnEditModal = document.querySelector('.ui.modal#project-column-modal-edit'); const elColumnEditForm = elColumnEditModal.querySelector('form'); @@ -114,9 +109,10 @@ export function initRepoProject(): void { elColumnEditForm.classList.add('is-loading'); await request(formLink, {method: formMethod, data: formData}); if (!columnId) { - window.location.reload(); + window.location.reload(); // newly added column, need to reload the page return; } + fomanticQuery(elColumnEditModal).modal('hide'); // update the newly saved column title and color in the project board (to avoid reload) const elEditButton = writableProjectBoard.querySelector(`.show-project-column-modal-edit[${dataAttrColumnId}="${columnId}"]`); @@ -136,9 +132,16 @@ export function initRepoProject(): void { elBoardColumn.style.removeProperty('color'); queryElemChildren(elBoardColumn, '.divider', (divider) => divider.style.removeProperty('color')); } - fomanticQuery(elColumnEditModal).modal('hide'); } finally { elColumnEditForm.classList.remove('is-loading'); } }); } + +export function initRepoProject(): void { + const writableProjectBoard = document.querySelector('#project-board[data-project-borad-writable="true"]'); + if (!writableProjectBoard) return; + + initRepoProjectSortable(); // no await + initRepoProjectColumnEdit(writableProjectBoard); +} From d75af4e0df6662969ddbb6d52cd9f9d5e75df330 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 19 Dec 2024 13:28:03 +0800 Subject: [PATCH 08/10] shorten names since there is a dedicated function --- web_src/js/features/repo-projects.ts | 52 ++++++++++++++-------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/web_src/js/features/repo-projects.ts b/web_src/js/features/repo-projects.ts index 0b09ec730832c..b8e37f5eaf8cd 100644 --- a/web_src/js/features/repo-projects.ts +++ b/web_src/js/features/repo-projects.ts @@ -75,56 +75,56 @@ async function initRepoProjectSortable(): Promise { } function initRepoProjectColumnEdit(writableProjectBoard: Element): void { - const elColumnEditModal = document.querySelector('.ui.modal#project-column-modal-edit'); - const elColumnEditForm = elColumnEditModal.querySelector('form'); + const elModal = document.querySelector('.ui.modal#project-column-modal-edit'); + const elForm = elModal.querySelector('form'); - const elColumnEditId = elColumnEditForm.querySelector('input[name="id"]'); - const elColumnEditTitle = elColumnEditForm.querySelector('input[name="title"]'); - const elColumnEditColor = elColumnEditForm.querySelector('input[name="color"]'); + const elColumnId = elForm.querySelector('input[name="id"]'); + const elColumnTitle = elForm.querySelector('input[name="title"]'); + const elColumnColor = elForm.querySelector('input[name="color"]'); - const dataAttrColumnId = 'data-modal-project-column-id'; - const dataAttrColumnTitle = 'data-modal-project-column-title-input'; - const dataAttrColumnColor = 'data-modal-project-column-color-input'; + const attrDataColumnId = 'data-modal-project-column-id'; + const attrDataColumnTitle = 'data-modal-project-column-title-input'; + const attrDataColumnColor = 'data-modal-project-column-color-input'; // the "new" button is not in project board, so need to query from document queryElems(document, '.show-project-column-modal-edit', (el) => { el.addEventListener('click', () => { - elColumnEditId.value = el.getAttribute(dataAttrColumnId); - elColumnEditTitle.value = el.getAttribute(dataAttrColumnTitle); - elColumnEditColor.value = el.getAttribute(dataAttrColumnColor); - elColumnEditColor.dispatchEvent(new Event('input', {bubbles: true})); // trigger the color picker + elColumnId.value = el.getAttribute(attrDataColumnId); + elColumnTitle.value = el.getAttribute(attrDataColumnTitle); + elColumnColor.value = el.getAttribute(attrDataColumnColor); + elColumnColor.dispatchEvent(new Event('input', {bubbles: true})); // trigger the color picker }); }); - elColumnEditForm.addEventListener('submit', async (e) => { + elForm.addEventListener('submit', async (e) => { e.preventDefault(); - const columnId = elColumnEditId.value; - const actionBaseLink = elColumnEditForm.getAttribute('data-action-base-link'); + const columnId = elColumnId.value; + const actionBaseLink = elForm.getAttribute('data-action-base-link'); - const formData = new FormData(elColumnEditForm); + const formData = new FormData(elForm); const formLink = columnId ? `${actionBaseLink}/${columnId}` : `${actionBaseLink}/columns/new`; const formMethod = columnId ? 'PUT' : 'POST'; try { - elColumnEditForm.classList.add('is-loading'); + elForm.classList.add('is-loading'); await request(formLink, {method: formMethod, data: formData}); if (!columnId) { window.location.reload(); // newly added column, need to reload the page return; } - fomanticQuery(elColumnEditModal).modal('hide'); + fomanticQuery(elModal).modal('hide'); // update the newly saved column title and color in the project board (to avoid reload) - const elEditButton = writableProjectBoard.querySelector(`.show-project-column-modal-edit[${dataAttrColumnId}="${columnId}"]`); - elEditButton.setAttribute(dataAttrColumnTitle, elColumnEditTitle.value); - elEditButton.setAttribute(dataAttrColumnColor, elColumnEditColor.value); + const elEditButton = writableProjectBoard.querySelector(`.show-project-column-modal-edit[${attrDataColumnId}="${columnId}"]`); + elEditButton.setAttribute(attrDataColumnTitle, elColumnTitle.value); + elEditButton.setAttribute(attrDataColumnColor, elColumnColor.value); const elBoardColumn = writableProjectBoard.querySelector(`.project-column[data-id="${columnId}"]`); const elBoardColumnTitle = elBoardColumn.querySelector(`.project-column-title-text`); - elBoardColumnTitle.textContent = elColumnEditTitle.value; - if (elColumnEditColor.value) { - const textColor = contrastColor(elColumnEditColor.value); - elBoardColumn.style.setProperty('background', elColumnEditColor.value, 'important'); + elBoardColumnTitle.textContent = elColumnTitle.value; + if (elColumnColor.value) { + const textColor = contrastColor(elColumnColor.value); + elBoardColumn.style.setProperty('background', elColumnColor.value, 'important'); elBoardColumn.style.setProperty('color', textColor, 'important'); queryElemChildren(elBoardColumn, '.divider', (divider) => divider.style.color = textColor); } else { @@ -133,7 +133,7 @@ function initRepoProjectColumnEdit(writableProjectBoard: Element): void { queryElemChildren(elBoardColumn, '.divider', (divider) => divider.style.removeProperty('color')); } } finally { - elColumnEditForm.classList.remove('is-loading'); + elForm.classList.remove('is-loading'); } }); } From fe105b230dc2a2181c064f8315a72dece8486639 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 19 Dec 2024 07:31:46 +0100 Subject: [PATCH 09/10] misc tweaks --- web_src/js/features/repo-projects.ts | 15 ++++++++------- web_src/js/modules/sortable.ts | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/web_src/js/features/repo-projects.ts b/web_src/js/features/repo-projects.ts index b8e37f5eaf8cd..13a10be902cae 100644 --- a/web_src/js/features/repo-projects.ts +++ b/web_src/js/features/repo-projects.ts @@ -3,14 +3,15 @@ import {createSortable} from '../modules/sortable.ts'; import {POST, request} from '../modules/fetch.ts'; import {fomanticQuery} from '../modules/fomantic/base.ts'; import {queryElemChildren, queryElems} from '../utils/dom.ts'; +import type {SortableEvent} from 'sortablejs'; function updateIssueCount(card: HTMLElement): void { const parent = card.parentElement; - const cnt = parent.querySelectorAll('.issue-card').length; - parent.querySelector('.project-column-issue-count').textContent = String(cnt); + const count = parent.querySelectorAll('.issue-card').length; + parent.querySelector('.project-column-issue-count').textContent = String(count); } -async function moveIssue({item, from, to, oldIndex}: {item: HTMLElement, from: HTMLElement, to: HTMLElement, oldIndex: number}): Promise { +async function moveIssue({item, from, to, oldIndex}: SortableEvent): Promise { const columnCards = to.querySelectorAll('.issue-card'); updateIssueCount(from); updateIssueCount(to); @@ -35,7 +36,7 @@ async function moveIssue({item, from, to, oldIndex}: {item: HTMLElement, from: H async function initRepoProjectSortable(): Promise { // the HTML layout is: #project-board > .board > .project-column .cards > .issue-card const mainBoard = document.querySelector('#project-board > .board.sortable'); - let boardColumns = mainBoard.querySelectorAll('.project-column'); + let boardColumns = mainBoard.querySelectorAll('.project-column'); createSortable(mainBoard, { group: 'project-column', draggable: '.project-column', @@ -43,7 +44,7 @@ async function initRepoProjectSortable(): Promise { delayOnTouchOnly: true, delay: 500, onSort: async () => { // eslint-disable-line @typescript-eslint/no-misused-promises - boardColumns = mainBoard.querySelectorAll('.project-column'); + boardColumns = mainBoard.querySelectorAll('.project-column'); const columnSorting = { columns: Array.from(boardColumns, (column, i) => ({ @@ -87,7 +88,7 @@ function initRepoProjectColumnEdit(writableProjectBoard: Element): void { const attrDataColumnColor = 'data-modal-project-column-color-input'; // the "new" button is not in project board, so need to query from document - queryElems(document, '.show-project-column-modal-edit', (el) => { + queryElems(document, '.show-project-column-modal-edit', (el: Element) => { el.addEventListener('click', () => { elColumnId.value = el.getAttribute(attrDataColumnId); elColumnTitle.value = el.getAttribute(attrDataColumnTitle); @@ -96,7 +97,7 @@ function initRepoProjectColumnEdit(writableProjectBoard: Element): void { }); }); - elForm.addEventListener('submit', async (e) => { + elForm.addEventListener('submit', async (e: SubmitEvent) => { e.preventDefault(); const columnId = elColumnId.value; const actionBaseLink = elForm.getAttribute('data-action-base-link'); diff --git a/web_src/js/modules/sortable.ts b/web_src/js/modules/sortable.ts index ce5a0dc3c49c3..b700633cbb93c 100644 --- a/web_src/js/modules/sortable.ts +++ b/web_src/js/modules/sortable.ts @@ -1,7 +1,7 @@ import type {SortableOptions, SortableEvent} from 'sortablejs'; -import type Sortable from 'sortablejs'; +import type SortableType from 'sortablejs'; -export async function createSortable(el: Element, opts: {handle?: string} & SortableOptions = {}): Promise { +export async function createSortable(el: Element, opts: {handle?: string} & SortableOptions = {}): Promise { // @ts-expect-error: wrong type derived by typescript const {Sortable} = await import(/* webpackChunkName: "sortablejs" */'sortablejs'); From 80d408fb7e32e4a57bb00729b6c7f77d91bac8d9 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 19 Dec 2024 07:45:35 +0100 Subject: [PATCH 10/10] remove inferred types --- web_src/js/features/repo-projects.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/js/features/repo-projects.ts b/web_src/js/features/repo-projects.ts index 13a10be902cae..11f5c19c8d335 100644 --- a/web_src/js/features/repo-projects.ts +++ b/web_src/js/features/repo-projects.ts @@ -88,7 +88,7 @@ function initRepoProjectColumnEdit(writableProjectBoard: Element): void { const attrDataColumnColor = 'data-modal-project-column-color-input'; // the "new" button is not in project board, so need to query from document - queryElems(document, '.show-project-column-modal-edit', (el: Element) => { + queryElems(document, '.show-project-column-modal-edit', (el) => { el.addEventListener('click', () => { elColumnId.value = el.getAttribute(attrDataColumnId); elColumnTitle.value = el.getAttribute(attrDataColumnTitle); @@ -97,7 +97,7 @@ function initRepoProjectColumnEdit(writableProjectBoard: Element): void { }); }); - elForm.addEventListener('submit', async (e: SubmitEvent) => { + elForm.addEventListener('submit', async (e) => { e.preventDefault(); const columnId = elColumnId.value; const actionBaseLink = elForm.getAttribute('data-action-base-link');