self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-04-01 21:24:45 +02:00
Code Issues Releases Activity

Server: Refactor table structure

Browse Source
This commit is contained in:
Laurent Cozic 2022-10-16 16:27:09 +01:00
parent 59a7dd6673
commit 8ea6d89d49
7 changed files with 155 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
packages/server/src/routes/admin/emails.ts
View File

@ -3,7 +3,7 @@ import Router from '../../utils/Router';
import { RouteType } from '../../utils/types'; import { RouteType } from '../../utils/types';
import { AppContext } from '../../utils/types'; import { AppContext } from '../../utils/types';
import defaultView from '../../utils/defaultView'; import defaultView from '../../utils/defaultView';
import { makeTablePagination, makeTableView, Row, Table } from '../../utils/views/table'; import { makeTablePagination, makeTableView, Row, Table, renderUserIcon } from '../../utils/views/table';
import { PaginationOrderDir } from '../../models/utils/pagination'; import { PaginationOrderDir } from '../../models/utils/pagination';
import { formatDateTime } from '../../utils/time'; import { formatDateTime } from '../../utils/time';
import { adminEmailsUrl, adminEmailUrl, adminUserUrl } from '../../utils/urlUtils'; import { adminEmailsUrl, adminEmailUrl, adminUserUrl } from '../../utils/urlUtils';
@ -69,40 +69,39 @@ router.get('admin/emails', async (_path: SubPath, ctx: AppContext) => {
error = d.error ? d.error : '(Unspecified error)'; error = d.error ? d.error : '(Unspecified error)';
} }
const row: Row = [ const row: Row = {
{ items: [
value: d.id.toString(), {
}, value: d.id.toString(),
{
value: senderName,
url: sender.email ? `mailto:${escape(sender.email)}` : '',
},
{
value: d.recipient_name || d.recipient_email,
url: `mailto:${escape(d.recipient_email)}`,
},
{
value: d.recipient_id,
url: d.recipient_id ? adminUserUrl(d.recipient_id) : '',
render: (): string => {
return '<i class="fas fa-user-alt"></i>';
}, },
}, {
{ value: senderName,
value: substrWithEllipsis(d.subject, 0, 32), url: sender.email ? `mailto:${escape(sender.email)}` : '',
url: adminEmailUrl(d.id), },
}, {
{ value: d.recipient_name || d.recipient_email,
value: formatDateTime(d.created_time), url: `mailto:${escape(d.recipient_email)}`,
}, },
{ {
value: formatDateTime(d.sent_time), value: d.recipient_id,
}, url: d.recipient_id ? adminUserUrl(d.recipient_id) : '',
{ render: renderUserIcon,
value: error, },
}, {
value: substrWithEllipsis(d.subject, 0, 32),
]; url: adminEmailUrl(d.id),
},
{
value: formatDateTime(d.created_time),
},
{
value: formatDateTime(d.sent_time),
},
{
value: error,
},
],
};
return row; return row;
}), }),

52
packages/server/src/routes/admin/tasks.ts
View File

@ -64,31 +64,33 @@ router.get('admin/tasks', async (_path: SubPath, ctx: AppContext) => {
const state = taskService.taskState(taskId); const state = taskService.taskState(taskId);
const events = await taskService.taskLastEvents(taskId); const events = await taskService.taskLastEvents(taskId);
taskRows.push([ taskRows.push({
{ items: [
value: `checkbox_${taskId}`, {
checkbox: true, value: `checkbox_${taskId}`,
}, checkbox: true,
{ },
value: taskId.toString(), {
}, value: taskId.toString(),
{ },
value: task.description, {
}, value: task.description,
{ },
value: task.schedule, {
hint: prettyCron.toString(task.schedule), value: task.schedule,
}, hint: prettyCron.toString(task.schedule),
{ },
value: yesOrNo(state.running), {
}, value: yesOrNo(state.running),
{ },
value: events.taskStarted ? formatDateTime(events.taskStarted.created_time) : '-', {
}, value: events.taskStarted ? formatDateTime(events.taskStarted.created_time) : '-',
{ },
value: events.taskCompleted ? formatDateTime(events.taskCompleted.created_time) : '-', {
}, value: events.taskCompleted ? formatDateTime(events.taskCompleted.created_time) : '-',
]); },
],
});
} }
const table: Table = { const table: Table = {

66
packages/server/src/routes/admin/user_deletions.ts
View File

@ -71,38 +71,40 @@ router.get('admin/user_deletions', async (_path: SubPath, ctx: AppContext) => {
rows: page.items.map(d => { rows: page.items.map(d => {
const isDone = d.end_time && d.success; const isDone = d.end_time && d.success;
const row: Row = [ const row: Row = {
{ items: [
value: `checkbox_${d.id}`, {
checkbox: true, value: `checkbox_${d.id}`,
}, checkbox: true,
{ },
value: isDone ? d.user_id : users.find(u => u.id === d.user_id).email, {
stretch: true, value: isDone ? d.user_id : users.find(u => u.id === d.user_id).email,
url: isDone ? '' : userUrl(d.user_id), stretch: true,
}, url: isDone ? '' : userUrl(d.user_id),
{ },
value: yesOrNo(d.process_data), {
}, value: yesOrNo(d.process_data),
{ },
value: yesOrNo(d.process_account), {
}, value: yesOrNo(d.process_account),
{ },
value: formatDateTime(d.scheduled_time), {
}, value: formatDateTime(d.scheduled_time),
{ },
value: formatDateTime(d.start_time), {
}, value: formatDateTime(d.start_time),
{ },
value: formatDateTime(d.end_time), {
}, value: formatDateTime(d.end_time),
{ },
value: d.end_time ? yesOrNo(d.success) : '-', {
}, value: d.end_time ? yesOrNo(d.success) : '-',
{ },
value: d.error, {
}, value: d.error,
]; },
],
};
return row; return row;
}), }),

28
packages/server/src/routes/index/changes.ts
View File

@ -41,19 +41,21 @@ router.get('changes', async (_path: SubPath, ctx: AppContext) => {
}, },
], ],
rows: paginatedChanges.items.map(change => { rows: paginatedChanges.items.map(change => {
const row: Row = [ const row: Row = {
{ items: [
value: change.item_name, {
stretch: true, value: change.item_name,
url: showItemUrls(config()) ? (items.find(i => i.id === change.item_id) ? ctx.joplin.models.item().itemContentUrl(change.item_id) : '') : null, stretch: true,
}, url: showItemUrls(config()) ? (items.find(i => i.id === change.item_id) ? ctx.joplin.models.item().itemContentUrl(change.item_id) : '') : null,
{ },
value: changeTypeToString(change.type), {
}, value: changeTypeToString(change.type),
{ },
value: formatDateTime(change.updated_time), {
}, value: formatDateTime(change.updated_time),
]; },
],
};
return row; return row;
}), }),

34
packages/server/src/routes/index/items.ts
View File

@ -44,22 +44,24 @@ router.get('items', async (_path: SubPath, ctx: AppContext) => {
}, },
], ],
rows: paginatedItems.items.map(item => { rows: paginatedItems.items.map(item => {
const row: Row = [ const row: Row = {
{ items: [
value: item.name, {
stretch: true, value: item.name,
url: showItemUrls(config()) ? `${config().userContentBaseUrl}/items/${item.id}/content` : null, stretch: true,
}, url: showItemUrls(config()) ? `${config().userContentBaseUrl}/items/${item.id}/content` : null,
{ },
value: formatBytes(item.content_size), {
}, value: formatBytes(item.content_size),
{ },
value: item.mime_type || 'binary', {
}, value: item.mime_type || 'binary',
{ },
value: formatDateTime(item.updated_time), {
}, value: formatDateTime(item.updated_time),
]; },
],
};
return row; return row;
}), }),

37
packages/server/src/utils/views/table.ts
View File

@ -47,7 +47,10 @@ interface RowItem {
render?: RowItemRenderCallback; render?: RowItemRenderCallback;
} }
export type Row = RowItem[]; export interface Row {
classNames?: string[];
items: RowItem[];
}
interface RowItemView { interface RowItemView {
value: string; value: string;
@ -58,7 +61,10 @@ interface RowItemView {
hint: string; hint: string;
} }
type RowView = RowItemView[]; interface RowView {
classNames: string[];
items: RowItemView[];
}
export interface Table { export interface Table {
headers: Header[]; headers: Header[];
@ -97,16 +103,19 @@ function makeHeaderView(header: Header, parentBaseUrl: string, baseUrlQuery: Pag
} }
function makeRowView(row: Row): RowView { function makeRowView(row: Row): RowView {
return row.map(rowItem => { return {
return { classNames: row.classNames,
value: rowItem.value, items: row.items.map(rowItem => {
valueHtml: rowItem.render ? rowItem.render() : '', return {
classNames: [rowItem.stretch ? 'stretch' : 'nowrap'], value: rowItem.value,
url: rowItem.url, valueHtml: rowItem.render ? rowItem.render() : '',
checkbox: rowItem.checkbox, classNames: [rowItem.stretch ? 'stretch' : 'nowrap'],
hint: rowItem.hint, url: rowItem.url,
}; checkbox: rowItem.checkbox,
}); hint: rowItem.hint,
};
}),
};
} }
export function makeTableView(table: Table): TableView { export function makeTableView(table: Table): TableView {
@ -132,3 +141,7 @@ export function makeTableView(table: Table): TableView {
export function tablePartials(): string[] { export function tablePartials(): string[] {
return ['pagination', 'table', 'tableHeader', 'tableRowItem']; return ['pagination', 'table', 'tableHeader', 'tableRowItem'];
} }
export const renderUserIcon = () => {
return '<i class="fas fa-user-alt"></i>';
};

6
packages/server/src/views/partials/table.mustache
View File

@ -9,10 +9,10 @@
</thead> </thead>
<tbody> <tbody>
{{#rows}} {{#rows}}
<tr> <tr class="{{#classNames}}{{.}} {{/classNames}}">
{{#.}} {{#items}}
{{>tableRowItem}} {{>tableRowItem}}
{{/.}} {{/items}}
</tr> </tr>
{{/rows}} {{/rows}}
</tbody> </tbody>