thohlt/archtika
1
0
Fork 0
mirror of https://github.com/thiloho/archtika.git synced 2025-11-22 10:51:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Show logs and usernames for deleted users and remove svg mimetype for client side

Browse Source
This commit is contained in:
thiloho
2024-09-14 15:12:08 +02:00
parent 79d1c9f5c7
commit 5f38500b9c
11 changed files with 119 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
web-app/src/lib/db-schema.ts
View File

@@ -83,6 +83,7 @@ export interface ChangeLog {
id: string;
website_id: string | null;
user_id: string | null;
username: string;
tstamp: Date;
table_name: string;
operation: string;
@@ -93,6 +94,7 @@ export interface ChangeLogInput {
id?: string;
website_id?: string | null;
user_id?: string | null;
username?: string;
tstamp?: Date;
table_name: string;
operation: string;
@@ -105,6 +107,7 @@ const change_log = {
"id",
"website_id",
"user_id",
"username",
"tstamp",
"table_name",
"operation",
@@ -320,7 +323,7 @@ const legal_information = {
export interface Media {
id: string;
website_id: string;
user_id: string;
user_id: string | null;
blob: string;
mimetype: string;
original_name: string;
@@ -329,7 +332,7 @@ export interface Media {
export interface MediaInput {
id?: string;
website_id: string;
user_id?: string;
user_id?: string | null;
blob: string;
mimetype: string;
original_name: string;

2
web-app/src/lib/utils.ts
View File

@@ -15,7 +15,7 @@ import type {
LegalInformation
} from "$lib/db-schema";
export const ALLOWED_MIME_TYPES = ["image/jpeg", "image/png", "image/svg+xml", "image/webp"];
export const ALLOWED_MIME_TYPES = ["image/jpeg", "image/png", "image/webp"];
export const slugify = (string: string) => {
return string

4
web-app/src/routes/(authenticated)/website/[websiteId]/collaborators/+page.svelte
View File

@@ -69,10 +69,10 @@
</h2>
<ul class="unpadded">
{#each data.collaborators as { website_id, user_id, permission_level, user: { username } } (`${website_id}-${user_id}`)}
{#each data.collaborators as { website_id, user_id, permission_level, user } (`${website_id}-${user_id}`)}
<li class="collaborator-card">
<p>
<strong>{username} ({permission_level})</strong>
<strong>{user?.username} ({permission_level})</strong>
</p>
<div class="collaborator-card__actions">

4
web-app/src/routes/(authenticated)/website/[websiteId]/logs/+page.server.ts
View File

@@ -9,10 +9,10 @@ export const load: PageServerLoad = async ({ parent, fetch, params, cookies, url
const searchParams = new URLSearchParams();
const baseFetchUrl = `${API_BASE_PREFIX}/change_log?website_id=eq.${params.websiteId}&select=id,table_name,operation,tstamp,old_value,new_value,user!inner(username)&order=tstamp.desc`;
const baseFetchUrl = `${API_BASE_PREFIX}/change_log?website_id=eq.${params.websiteId}&select=id,table_name,operation,tstamp,old_value,new_value,user_id,username&order=tstamp.desc`;
if (userFilter && userFilter !== "all") {
searchParams.append("user.username", `eq.${userFilter}`);
searchParams.append("username", `eq.${userFilter}`);
}
if (resourceFilter && resourceFilter !== "all") {

8
web-app/src/routes/(authenticated)/website/[websiteId]/logs/+page.svelte
View File

@@ -126,9 +126,13 @@
</tr>
</thead>
<tbody>
{#each data.changeLog as { id, table_name, operation, tstamp, old_value, new_value, user }}
{#each data.changeLog as { id, table_name, operation, tstamp, old_value, new_value, user_id, username }}
<tr>
<td>{user.username}</td>
<td>
<span style:text-decoration={user_id ? "" : "line-through"}>
{username}
</span>
</td>
<td>{table_name}</td>
<td>{operation}</td>
<td>