From 18e769b5e51fb2ff020c5b95094a9b489b57cf02 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 13 Sep 2022 10:14:15 +0200
Subject: [PATCH] fix: plausible analytics actions

---
 apps/api/src/routes/api/v1/services/handlers.ts |  4 ++--
 apps/ui/src/routes/__layout.svelte              | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/apps/api/src/routes/api/v1/services/handlers.ts b/apps/api/src/routes/api/v1/services/handlers.ts
index 48e58ca78..2207841d2 100644
--- a/apps/api/src/routes/api/v1/services/handlers.ts
+++ b/apps/api/src/routes/api/v1/services/handlers.ts
@@ -456,7 +456,7 @@ export async function activatePlausibleUsers(request: FastifyRequest<OnlyId>, re
         if (destinationDockerId) {
             await executeDockerCmd({
                 dockerId: destinationDocker.id,
-                command: `docker exec ${id} 'psql -H postgresql://${postgresqlUser}:${postgresqlPassword}@localhost:5432/${postgresqlDatabase} -c "UPDATE users SET email_verified = true;"'`
+                command: `docker exec ${id}-postgresql psql -H postgresql://${postgresqlUser}:${postgresqlPassword}@localhost:5432/${postgresqlDatabase} -c "UPDATE users SET email_verified = true;"`
             })
             return await reply.code(201).send()
         }
@@ -476,7 +476,7 @@ export async function cleanupPlausibleLogs(request: FastifyRequest<OnlyId>, repl
         if (destinationDockerId) {
             await executeDockerCmd({
                 dockerId: destinationDocker.id,
-                command: `docker exec ${id}-clickhouse sh -c "/usr/bin/clickhouse-client -q \\"SELECT name FROM system.tables WHERE name LIKE '%log%';\\"| xargs -I{} /usr/bin/clickhouse-client -q \"TRUNCATE TABLE system.{};\""`
+                command: `docker exec ${id}-clickhouse /usr/bin/clickhouse-client -q \\"SELECT name FROM system.tables WHERE name LIKE '%log%';\\"| xargs -I{} /usr/bin/clickhouse-client -q \"TRUNCATE TABLE system.{};\"`
             })
             return await reply.code(201).send()
         }
diff --git a/apps/ui/src/routes/__layout.svelte b/apps/ui/src/routes/__layout.svelte
index 8694dfe45..071c9f75d 100644
--- a/apps/ui/src/routes/__layout.svelte
+++ b/apps/ui/src/routes/__layout.svelte
@@ -219,6 +219,8 @@
 						<path d="M21 21v-2a4 4 0 0 0 -3 -3.85" />
 					</svg>
 				</a>
+				<Tooltip triggeredBy="#iam" placement="right" color="bg-iam">IAM</Tooltip>
+
 				<a
 					id="settings"
 					sveltekit:prefetch
@@ -245,6 +247,9 @@
 						<circle cx="12" cy="12" r="3" />
 					</svg>
 				</a>
+				<Tooltip triggeredBy="#settings" placement="right" color="bg-settings  text-black"
+					>Settings</Tooltip
+				>
 
 				<div id="logout" class="icons bg-coolgray-200 hover:text-error" on:click={logout}>
 					<svg
@@ -264,6 +269,8 @@
 						<path d="M7 12h14l-3 -3m0 6l3 -3" />
 					</svg>
 				</div>
+				<Tooltip triggeredBy="#logout" placement="right" color="bg-red-600">Logout</Tooltip>
+
 				<div
 					class="w-full text-center font-bold text-stone-400 hover:bg-coolgray-200 hover:text-white"
 				>
@@ -287,8 +294,3 @@
 		<slot />
 	</div>
 </main>
-
-<Tooltip triggeredBy="#iam" placement="right" color="bg-iam">IAM</Tooltip>
-<Tooltip triggeredBy="#settings" placement="right" color="bg-settings  text-black">Settings</Tooltip
->
-<Tooltip triggeredBy="#logout" placement="right" color="bg-red-600">Logout</Tooltip>