New translations en-us.json (French)

[ci skip]

messages/bg-BG.json

@@ -1397,6 +1397,7 @@
     "createOrgUser": "Създаване на Организационна Потребител",
     "actionUpdateOrg": "Актуализиране на организацията",
     "actionRemoveInvitation": "Премахване на поканата.",
+    "actionRemoveUserRole": "Remove User Role",
     "actionUpdateUser": "Актуализиране на потребител",
     "actionGetUser": "Получаване на потребител",
     "actionGetOrgUser": "Вземете потребител на организация",

messages/cs-CZ.json

@@ -1397,6 +1397,7 @@
     "createOrgUser": "Vytvořit Org uživatele",
     "actionUpdateOrg": "Aktualizovat organizaci",
     "actionRemoveInvitation": "Odstranit pozvání",
+    "actionRemoveUserRole": "Remove User Role",
     "actionUpdateUser": "Aktualizovat uživatele",
     "actionGetUser": "Získat uživatele",
     "actionGetOrgUser": "Získat uživatele organizace",

messages/da-DK.json

@@ -1397,6 +1397,7 @@
     "createOrgUser": "Opret organisationsbruger",
     "actionUpdateOrg": "Opdater organisation",
     "actionRemoveInvitation": "Fjern invitation",
+    "actionRemoveUserRole": "Remove User Role",
     "actionUpdateUser": "Opdater bruger",
     "actionGetUser": "Hent bruger",
     "actionGetOrgUser": "Hent organisationsbruger",

messages/de-DE.json

@@ -1397,6 +1397,7 @@
     "createOrgUser": "Org Benutzer erstellen",
     "actionUpdateOrg": "Organisation aktualisieren",
     "actionRemoveInvitation": "Einladung entfernen",
+    "actionRemoveUserRole": "Remove User Role",
     "actionUpdateUser": "Benutzer aktualisieren",
     "actionGetUser": "Benutzer abrufen",
     "actionGetOrgUser": "Organisationsbenutzer abrufen",

messages/es-ES.json

@@ -1397,6 +1397,7 @@
     "createOrgUser": "Crear usuario Org",
     "actionUpdateOrg": "Actualizar organización",
     "actionRemoveInvitation": "Eliminar invitación",
+    "actionRemoveUserRole": "Remove User Role",
     "actionUpdateUser": "Actualizar usuario",
     "actionGetUser": "Obtener usuario",
     "actionGetOrgUser": "Obtener usuario de la organización",

messages/fr-FR.json

@@ -1397,6 +1397,7 @@
     "createOrgUser": "Créer un utilisateur Org",
     "actionUpdateOrg": "Mettre à jour l'organisation",
     "actionRemoveInvitation": "Supprimer l'invitation",
+    "actionRemoveUserRole": "Remove User Role",
     "actionUpdateUser": "Mettre à jour l'utilisateur",
     "actionGetUser": "Obtenir l'utilisateur",
     "actionGetOrgUser": "Obtenir l'utilisateur de l'organisation",

messages/it-IT.json

@@ -1397,6 +1397,7 @@
     "createOrgUser": "Crea Utente Org",
     "actionUpdateOrg": "Aggiorna Organizzazione",
     "actionRemoveInvitation": "Rimuovi Invito",
+    "actionRemoveUserRole": "Remove User Role",
     "actionUpdateUser": "Aggiorna Utente",
     "actionGetUser": "Ottieni Utente",
     "actionGetOrgUser": "Ottieni Utente Organizzazione",

messages/ko-KR.json

@@ -1397,6 +1397,7 @@
     "createOrgUser": "조직 사용자 생성",
     "actionUpdateOrg": "조직 업데이트",
     "actionRemoveInvitation": "초대 제거",
+    "actionRemoveUserRole": "Remove User Role",
     "actionUpdateUser": "사용자 업데이트",
     "actionGetUser": "사용자 조회",
     "actionGetOrgUser": "조직 사용자 가져오기",

messages/nb-NO.json

@@ -1397,6 +1397,7 @@
     "createOrgUser": "Opprett Org bruker",
     "actionUpdateOrg": "Oppdater organisasjon",
     "actionRemoveInvitation": "Fjern invitasjon",
+    "actionRemoveUserRole": "Remove User Role",
     "actionUpdateUser": "Oppdater bruker",
     "actionGetUser": "Hent bruker",
     "actionGetOrgUser": "Hent organisasjonsbruker",

messages/nl-NL.json

@@ -1397,6 +1397,7 @@
     "createOrgUser": "Org gebruiker aanmaken",
     "actionUpdateOrg": "Organisatie bijwerken",
     "actionRemoveInvitation": "Verwijder uitnodiging",
+    "actionRemoveUserRole": "Remove User Role",
     "actionUpdateUser": "Gebruiker bijwerken",
     "actionGetUser": "Gebruiker ophalen",
     "actionGetOrgUser": "Krijg organisatie-gebruiker",

messages/pl-PL.json

@@ -1397,6 +1397,7 @@
     "createOrgUser": "Utwórz użytkownika Org",
     "actionUpdateOrg": "Aktualizuj organizację",
     "actionRemoveInvitation": "Usuń zaproszenie",
+    "actionRemoveUserRole": "Remove User Role",
     "actionUpdateUser": "Zaktualizuj użytkownika",
     "actionGetUser": "Pobierz użytkownika",
     "actionGetOrgUser": "Pobierz użytkownika organizacji",

messages/pt-PT.json

@@ -1397,6 +1397,7 @@
     "createOrgUser": "Criar utilizador Org",
     "actionUpdateOrg": "Atualizar Organização",
     "actionRemoveInvitation": "Remover Convite",
+    "actionRemoveUserRole": "Remove User Role",
     "actionUpdateUser": "Atualizar Usuário",
     "actionGetUser": "Obter Usuário",
     "actionGetOrgUser": "Obter Utilizador da Organização",

messages/ru-RU.json

@@ -1397,6 +1397,7 @@
     "createOrgUser": "Создать пользователя Org",
     "actionUpdateOrg": "Обновить организацию",
     "actionRemoveInvitation": "Удалить приглашение",
+    "actionRemoveUserRole": "Remove User Role",
     "actionUpdateUser": "Обновить пользователя",
     "actionGetUser": "Получить пользователя",
     "actionGetOrgUser": "Получить пользователя организации",

messages/tr-TR.json

@@ -1397,6 +1397,7 @@
     "createOrgUser": "Organizasyon Kullanıcısı Oluştur",
     "actionUpdateOrg": "Kuruluşu Güncelle",
     "actionRemoveInvitation": "Daveti Kaldır",
+    "actionRemoveUserRole": "Remove User Role",
     "actionUpdateUser": "Kullanıcıyı Güncelle",
     "actionGetUser": "Kullanıcıyı Getir",
     "actionGetOrgUser": "Kuruluş Kullanıcısını Al",

messages/zh-CN.json

@@ -1397,6 +1397,7 @@
     "createOrgUser": "创建组织用户",
     "actionUpdateOrg": "更新组织",
     "actionRemoveInvitation": "移除邀请",
+    "actionRemoveUserRole": "Remove User Role",
     "actionUpdateUser": "更新用户",
     "actionGetUser": "获取用户",
     "actionGetOrgUser": "获取组织用户",

server/lib/statusHistory.ts

@@ -1,6 +1,6 @@
 import { z } from "zod";
 import { db, logsDb, statusHistory } from "@server/db";
-import { and, eq, gte, lt, asc, desc, inArray } from "drizzle-orm";
+import { and, eq, gte, lt, asc, desc } from "drizzle-orm";
 import { regionalCache as cache } from "#dynamic/lib/cache";
 
 const STATUS_HISTORY_CACHE_TTL = 60; // seconds
@@ -273,81 +273,3 @@ export function computeBuckets(
 
     return { buckets, totalDowntime };
 }
-
-export interface BatchedStatusHistoryResponse {
-    entityType: string;
-    entityIds: number[];
-    days: StatusHistoryDayBucket[];
-    overallUptimePercent: number;
-    totalDowntimeSeconds: number;
-}
-
-export async function getBatchedStatusHistory(
-    entityType: string,
-    entityIds: number[],
-    days: number
-): Promise<BatchedStatusHistoryResponse> {
-    // const cacheKey = statusHistoryCacheKey(entityType, entityId, days);
-    // const cached = await cache.get<StatusHistoryResponse>(cacheKey);
-    // if (cached !== undefined) {
-    //     return cached;
-    // }
-
-    // Anchor to UTC midnight so the query window aligns with stable calendar days
-    const utcToday = new Date();
-    utcToday.setUTCHours(0, 0, 0, 0);
-    const todayMidnightSec = Math.floor(utcToday.getTime() / 1000);
-    const startSec = todayMidnightSec - days * 86400;
-
-    const events = await logsDb
-        .select()
-        .from(statusHistory)
-        .where(
-            and(
-                eq(statusHistory.entityType, entityType),
-                inArray(statusHistory.entityId, entityIds),
-                gte(statusHistory.timestamp, startSec)
-            )
-        )
-        .orderBy(asc(statusHistory.timestamp));
-
-    // Fetch the last known state before the window so that entities that
-    // haven't changed status recently still show the correct status rather
-    // than appearing as "no_data".
-    const [lastKnownEvent] = await logsDb
-        .select()
-        .from(statusHistory)
-        .where(
-            and(
-                eq(statusHistory.entityType, entityType),
-                inArray(statusHistory.entityId, entityIds),
-                lt(statusHistory.timestamp, startSec)
-            )
-        )
-        .orderBy(desc(statusHistory.timestamp))
-        .limit(1);
-
-    const priorStatus = lastKnownEvent?.status ?? null;
-
-    const { buckets, totalDowntime } = computeBuckets(
-        events,
-        days,
-        priorStatus
-    );
-    const totalWindow = days * 86400;
-    const overallUptime =
-        totalWindow > 0
-            ? Math.max(0, ((totalWindow - totalDowntime) / totalWindow) * 100)
-            : 100;
-
-    const result: BatchedStatusHistoryResponse = {
-        entityType,
-        entityIds,
-        days: buckets,
-        overallUptimePercent: Math.round(overallUptime * 100) / 100,
-        totalDowntimeSeconds: totalDowntime
-    };
-
-    // await cache.set(cacheKey, result, STATUS_HISTORY_CACHE_TTL);
-    return result;
-}

server/routers/site/getBatchedStatusHistory.ts

@@ -1,62 +0,0 @@
-import { Request, Response, NextFunction } from "express";
-import { z } from "zod";
-import response from "@server/lib/response";
-import HttpCode from "@server/types/HttpCode";
-import createHttpError from "http-errors";
-import logger from "@server/logger";
-import { fromError } from "zod-validation-error";
-import {
-    getCachedStatusHistory,
-    statusHistoryQuerySchema,
-    StatusHistoryResponse
-} from "@server/lib/statusHistory";
-
-const siteParamsSchema = z.object({
-    siteId: z.string().transform((v) => parseInt(v, 10))
-});
-
-export async function getBatchedSiteStatusHistory(
-    req: Request,
-    res: Response,
-    next: NextFunction
-): Promise<any> {
-    try {
-        const parsedParams = siteParamsSchema.safeParse(req.params);
-        if (!parsedParams.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedParams.error).toString()
-                )
-            );
-        }
-        const parsedQuery = statusHistoryQuerySchema.safeParse(req.query);
-        if (!parsedQuery.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedQuery.error).toString()
-                )
-            );
-        }
-
-        const entityType = "site";
-        const entityId = parsedParams.data.siteId;
-        const { days } = parsedQuery.data;
-
-        const data = await getCachedStatusHistory(entityType, entityId, days);
-
-        return response<StatusHistoryResponse>(res, {
-            data,
-            success: true,
-            error: false,
-            message: "Status history retrieved successfully",
-            status: HttpCode.OK
-        });
-    } catch (error) {
-        logger.error(error);
-        return next(
-            createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
-        );
-    }
-}

src/lib/queries.ts

@@ -640,28 +640,6 @@ export const orgQueries = {
                 };
             }
         }),
-    batchedSiteStatusHistory: ({
-        siteIds,
-        days = 90
-    }: {
-        siteIds: number[];
-        days?: number;
-    }) =>
-        queryOptions({
-            queryKey: [
-                "SITE_STATUS_HISTORY",
-                "BATCHED",
-                siteIds,
-                days
-            ] as const,
-            queryFn: async ({ signal, meta }) => {
-                // TODO
-                // const res = await meta!.api.get<
-                //     AxiosResponse<StatusHistoryResponse>
-                // >(`/site/${siteId}/status-history?days=${days}`, { signal });
-                // return res.data.data;
-            }
-        }),
     siteStatusHistory: ({
         siteId,
         days = 90