Update hivegrid-cloud reference to latest main

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
davidandClaude Fable 5 committed 2026-07-08 16:15:37 +02:00
1 parent e98d38e716
commit 7b21524c86
3781 files changed
+373484 -225607

No files matched your search

@@ -8,7 +8,7 @@ import InputSelect from "~/components/ui/input/InputSelect";
import InputText from "~/components/ui/input/InputText";
import Modal from "~/components/ui/modals/Modal";
import Tabs from "~/components/ui/tabs/Tabs";
import { renderSanitizedMarkdown } from "~/utils/html-sanitizer";
import { renderSanitizedMarkdown, sanitizeIconSvg } from "~/utils/html-sanitizer";
import { OnboardingBlockDto, OnboardingStepBlockDto } from "./OnboardingBlockUtils";
import OnboardingGridUtils from "./grid/OnboardingGridUtils";
@@ -133,7 +133,7 @@ export default function OnboardingVariantModal({
{step.icon && (
<>
{step.icon.startsWith("<svg") ? (
<div dangerouslySetInnerHTML={{ __html: step.icon.replace("<svg", `<svg class='${"h-5 w-5"}'`) ?? "" }} />
<div dangerouslySetInnerHTML={{ __html: sanitizeIconSvg(step.icon, "h-5 w-5") }} />
) : step.icon.startsWith("http") ? (
<img className="h-5 w-5" src={step.icon} alt={step.title} />
) : (
@@ -1,14 +0,0 @@
import type { Onboarding } from "@toolctrl/db/prisma-browser";
import { useTranslation } from "react-i18next";
import { Colors } from "~/application/enums/shared/Colors";
import SimpleBadge from "~/components/ui/badges/SimpleBadge";
export default function OnboardingBadge({ item }: { item: Onboarding }) {
const { t } = useTranslation();
return (
<>
{item.active && <SimpleBadge title={t("shared.active")} color={Colors.GREEN} />}
{!item.active && <SimpleBadge title={t("shared.inactive")} color={Colors.GRAY} />}
</>
);
}
@@ -1,16 +0,0 @@
import type { OnboardingSession } from "@toolctrl/db/prisma-browser";
import { useTranslation } from "react-i18next";
import { Colors } from "~/application/enums/shared/Colors";
import SimpleBadge from "~/components/ui/badges/SimpleBadge";
export default function OnboardingSessionBadge({ item }: { item: OnboardingSession }) {
const { t } = useTranslation();
return (
<>
{item.status === "active" && <SimpleBadge title={t("onboarding.object.sessions.active")} color={Colors.YELLOW} />}
{item.status === "started" && <SimpleBadge title={t("onboarding.object.sessions.started")} color={Colors.INDIGO} />}
{item.status === "dismissed" && <SimpleBadge title={t("onboarding.object.sessions.dismissed")} color={Colors.ORANGE} />}
{item.status === "completed" && <SimpleBadge title={t("onboarding.object.sessions.completed")} color={Colors.GREEN} />}
</>
);
}
@@ -1,231 +0,0 @@
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { RowHeaderDisplayDto } from "~/application/dtos/data/RowHeaderDisplayDto";
import TenantCell from "~/components/core/tenants/TenantCell";
import UserBadge from "~/components/core/users/UserBadge";
import ButtonTertiary from "~/components/ui/buttons/ButtonTertiary";
import DateCell from "~/components/ui/dates/DateCell";
import XIcon from "~/components/ui/icons/XIcon";
import ShowPayloadModalButton from "~/components/ui/json/ShowPayloadModalButton";
import Modal from "~/components/ui/modals/Modal";
import TableSimple from "~/components/ui/tables/TableSimple";
import { formatNumber, useLocaleFormatters } from "~/locale/format";
import { useAppOrAdminData } from "~/utils/data/useAppOrAdminData";
import { getUserHasPermission } from "~/utils/helpers/PermissionsHelper";
import { OnboardingSessionWithDetails } from "../db/onboardingSessions.db.server";
import { OnboardingFilterMetadataDto } from "../dtos/OnboardingFilterMetadataDto";
import OnboardingSessionUtils, { OnboardingSessionActivityDto } from "../utils/OnboardingSessionUtils";
import OnboardingBadge from "./OnboardingBadge";
import OnboardingSessionBadge from "./OnboardingSessionBadge";
export default function OnboardingSessionsTable({
items,
onDelete,
metadata,
withOnboarding = true,
}: {
items: OnboardingSessionWithDetails[];
onDelete?: (item: OnboardingSessionWithDetails) => void;
metadata: OnboardingFilterMetadataDto;
withOnboarding?: boolean;
}) {
const { i18n, t } = useTranslation();
const [selected, setSelected] = useState<OnboardingSessionWithDetails>();
const [headers, setHeaders] = useState<RowHeaderDisplayDto<OnboardingSessionWithDetails>[]>([]);
const appOrAdminData = useAppOrAdminData();
const locale = i18n.language;
useEffect(() => {
const headers: RowHeaderDisplayDto<OnboardingSessionWithDetails>[] = [
{
name: "status",
title: t("onboarding.session.status"),
value: (i) => <OnboardingSessionBadge item={i} />,
},
{
name: "user",
title: t("models.user.object"),
value: (i) => (
<div>
<UserBadge item={i.user} />
<TenantCell item={i.tenant} />
</div>
),
},
// {
// name: "tenant",
// title: t("models.tenant.object"),
// // eslint-disable-next-line react/jsx-no-undef
// value: (item) => <TenantCell item={item.tenant} />,
// },
{
name: "activity",
title: t("onboarding.session.activity"),
value: (i) => (
<div>
<button type="button" onClick={() => setSelected(i)} className="hover:border-theme-400 border-border border-b border-dotted hover:border-dashed">
{t("onboarding.session.activitiesCount", { count: OnboardingSessionUtils.getActivity({ t, item: i, metadata }).length })}
</button>
</div>
),
},
{
name: "steps",
title: t("onboarding.session.steps"),
value: (i) => (
<div>
<button type="button" onClick={() => setSelected(i)} className="hover:border-theme-400 border-border border-b border-dotted hover:border-dashed">
{t("onboarding.session.stepsCompletedCount", {
completed: formatNumber(i.sessionSteps.filter((f) => f.completedAt).length, locale),
total: formatNumber(i.sessionSteps.length, locale),
})}
</button>
</div>
),
},
{
name: "actions",
title: t("onboarding.session.actions"),
value: (i) => (
<ShowPayloadModalButton
title={t("onboarding.session.actions")}
description={t("onboarding.session.actionsCount", { count: i.actions.length })}
payload={JSON.stringify(i.actions, null, 2)}
/>
),
},
{
name: "createdAt",
title: t("shared.createdAt"),
value: (i) => <div className="flex justify-center">{i.createdAt ? <DateCell date={i.createdAt} /> : <XIcon className="h-4 w-4 text-red-500" />}</div>,
},
{
name: "startedAt",
title: t("onboarding.session.startedAt"),
value: (i) => <div className="flex justify-center">{i.startedAt ? <DateCell date={i.startedAt} /> : <XIcon className="h-4 w-4 text-red-500" />}</div>,
},
{
name: "dismissedAt",
title: t("onboarding.session.dismissedAt"),
value: (i) => (
<div className="flex justify-center">{i.dismissedAt ? <DateCell date={i.dismissedAt} /> : <XIcon className="h-4 w-4 text-red-500" />}</div>
),
},
{
name: "completedAt",
title: t("onboarding.session.completedAt"),
value: (i) => (
<div className="flex justify-center">{i.completedAt ? <DateCell date={i.completedAt} /> : <XIcon className="h-4 w-4 text-red-500" />}</div>
),
},
];
if (withOnboarding) {
headers.unshift({
name: "onboarding",
title: t("onboarding.title"),
value: (i) => (
<div className="flex items-center space-x-2">
<div className="text-base font-bold">{i.onboarding.title}</div>
<div>
<OnboardingBadge item={i.onboarding} />
</div>
</div>
),
});
}
headers.push({
name: "actions",
title: t("shared.actions"),
value: (i) => (
<div className="flex items-center space-x-2">
{onDelete && (
<ButtonTertiary disabled={!getUserHasPermission(appOrAdminData, "admin.onboarding.delete")} destructive type="button" onClick={() => onDelete(i)}>
{t("shared.delete")}
</ButtonTertiary>
)}
</div>
),
});
setHeaders(headers);
}, [appOrAdminData, locale, metadata, onDelete, t, withOnboarding]);
return (
<>
<SessionModal item={selected} open={selected !== undefined} onClose={() => setSelected(undefined)} metadata={metadata} />
<TableSimple
items={items}
actions={
[
// { title: t("shared.overview"), onClickRoute: (_, i) => `${i.id}` }
]
}
headers={headers}
noRecords={
<div className="p-12 text-center">
<h3 className="text-foreground mt-1 text-sm font-medium">{t("onboarding.session.empty.title")}</h3>
<p className="text-muted-foreground mt-1 text-sm">{t("onboarding.session.empty.description")}</p>
</div>
}
/>
</>
);
}
function SessionModal({
item,
open,
onClose,
metadata,
}: {
item?: OnboardingSessionWithDetails;
open: boolean;
onClose: () => void;
metadata: OnboardingFilterMetadataDto;
}) {
const { t } = useTranslation();
const formatters = useLocaleFormatters();
const [items, setItems] = useState<OnboardingSessionActivityDto[]>([]);
useEffect(() => {
if (!item) {
return;
}
setItems(OnboardingSessionUtils.getActivity({ t, item, metadata }));
}, [item, metadata, t]);
return (
<Modal open={open} setOpen={onClose} size="2xl">
<div className="bg-background inline-block w-full overflow-hidden text-left align-bottom sm:align-middle">
<div className="flex justify-between space-x-2">
<h3 className="text-foreground text-lg font-medium leading-6">{t("onboarding.session.object")}</h3>
<div className="text-muted-foreground text-sm italic">{item?.id}</div>
</div>
<div className="mt-4 space-y-2">
{" "}
<TableSimple
items={items}
headers={[
{
name: "createdAt",
title: t("onboarding.session.activityDate"),
value: (i) => (
<div className="text-muted-foreground">
{i.createdAt ? formatters.dateTime(i.createdAt, { timeStyle: "medium" }) : t("shared.notSet")}
</div>
),
},
{
name: "type",
title: t("shared.type"),
value: (i) => i.type,
},
{
name: "description",
title: t("onboarding.session.activityEvents.descriptionColumn"),
value: (i) => i.description,
className: "w-full",
},
]}
/>
</div>
</div>
</Modal>
);
}
@@ -1,79 +0,0 @@
import { Link } from "react-router";
import { useTranslation } from "react-i18next";
import TableSimple from "~/components/ui/tables/TableSimple";
import { useLocaleFormatters } from "~/locale/format";
import { OnboardingWithDetails } from "../db/onboarding.db.server";
import OnboardingBadge from "./OnboardingBadge";
import { adminPath } from "~/utils/app/CanonicalUrlUtils";
export default function OnboardingsList({ items, groupByStatus }: { items: OnboardingWithDetails[]; groupByStatus: { status: string; count: number }[] }) {
const { t } = useTranslation();
const formatters = useLocaleFormatters();
const sessionStatusCountKeys = {
active: "onboarding.session.statusCount.active",
started: "onboarding.session.statusCount.started",
dismissed: "onboarding.session.statusCount.dismissed",
completed: "onboarding.session.statusCount.completed",
} as const;
const formatSessionStatusCount = (status: "active" | "started" | "dismissed" | "completed", count: number) =>
t(sessionStatusCountKeys[status], { count, value: formatters.number(count) });
return (
<TableSimple
items={items}
actions={[{ title: t("shared.overview"), onClickRoute: (_, i) => `${i.id}` }]}
headers={[
{
name: "title",
title: t("onboarding.object.title"),
className: "w-full",
value: (i) => {
const sessionsTotal = i.sessions.length;
const activeTotal = i.sessions.filter((f) => f.status === "active").length;
const startedTotal = i.sessions.filter((f) => f.status === "started").length;
const dismissedTotal = i.sessions.filter((f) => f.status === "dismissed").length;
const completedTotal = i.sessions.filter((f) => f.status === "completed").length;
return (
<Link to={adminPath(`onboarding/onboardings/${i.id}`, { mode: "host-aware" })} className="group flex flex-col">
<div className="flex items-center space-x-2">
<div className="text-base font-bold group-hover:underline">{i.title}</div>
<div>
<OnboardingBadge item={i} />
</div>
{i.createdAt ? (
<>
<div>•</div>
<div className="text-muted-foreground text-sm">
<span>{formatters.relativeDate(i.createdAt)}</span>
</div>
</>
) : null}
</div>
<div className="flex items-center space-x-2">
<div className="text-muted-foreground text-sm">
{t("onboarding.session.count", { count: sessionsTotal, value: formatters.number(sessionsTotal) })}
</div>
<div>•</div>
<div className="text-muted-foreground text-sm">{formatSessionStatusCount("active", activeTotal)}</div>
<div>•</div>
<div className="text-muted-foreground text-sm">{formatSessionStatusCount("started", startedTotal)}</div>
<div>•</div>
<div className="text-muted-foreground text-sm">{formatSessionStatusCount("dismissed", dismissedTotal)}</div>
<div>•</div>
<div className="text-muted-foreground text-sm">{formatSessionStatusCount("completed", completedTotal)}</div>
</div>
</Link>
);
},
},
]}
noRecords={
<div className="p-12 text-center">
<h3 className="text-foreground mt-1 text-sm font-medium">{t("onboarding.object.empty.title")}</h3>
<p className="text-muted-foreground mt-1 text-sm">{t("onboarding.object.empty.description")}</p>
</div>
}
/>
);
}
@@ -1,4 +1,4 @@
import { Onboarding, OnboardingFilter, OnboardingStep, OnboardingSession, Prisma } from "@toolctrl/db/prisma-browser";
import { Onboarding, OnboardingFilter, OnboardingStep, OnboardingSession, Prisma } from "@hivegrid/db/prisma-browser";
import { PaginationDto } from "~/application/dtos/data/PaginationDto";
import { db } from "~/utils/db.server";
import { OnboardingFilterType } from "../dtos/OnboardingFilterTypes";
@@ -8,7 +8,7 @@ import {
OnboardingStep,
Prisma,
Tenant,
} from "@toolctrl/db/prisma-browser";
} from "@hivegrid/db/prisma-browser";
import { PaginationDto } from "~/application/dtos/data/PaginationDto";
import { db } from "~/utils/db.server";
import { UserSimple } from "~/utils/db/users.db.server";
@@ -1,11 +1,10 @@
import { Tenant, Entity, Role } from "@toolctrl/db/prisma-browser";
import { Tenant, Role } from "@hivegrid/db/prisma-browser";
import { SubscriptionProductDto } from "~/application/dtos/subscriptions/SubscriptionProductDto";
import { UserSimple } from "~/utils/db/users.db.server";
export interface OnboardingFilterMetadataDto {
users: UserSimple[];
tenants: Tenant[];
entities: Entity[];
subscriptionProducts: SubscriptionProductDto[];
roles: Role[];
}
@@ -16,7 +16,5 @@ export const OnboardingFilterTypes = [
"tenant.subscription.inactive",
"tenant.api.used",
"tenant.api.notUsed",
"tenant.user.entity.hasCreated",
"tenant.user.entity.hasNotCreated",
] as const;
export type OnboardingFilterType = (typeof OnboardingFilterTypes)[number];
@@ -1,4 +1,4 @@
import { OnboardingSessionFilterMatch, OnboardingFilter } from "@toolctrl/db/prisma-browser";
import { OnboardingSessionFilterMatch, OnboardingFilter } from "@hivegrid/db/prisma-browser";
export type OnboardingMatchingFilterDto = OnboardingSessionFilterMatch & {
onboardingFilter: OnboardingFilter;
@@ -1,154 +0,0 @@
import { describe, expect, it } from "vitest";
import { readRepoFile } from "~/utils/testing/repoPaths";
const adminOnboardingFiles = [
"apps/web/app/routes/admin/onboarding/onboardings.$id/danger.tsx",
"apps/web/app/routes/admin/onboarding/onboardings.$id/filters.tsx",
"apps/web/app/routes/admin/onboarding/onboardings.$id/index.tsx",
"apps/web/app/routes/admin/onboarding/onboardings.$id/settings.tsx",
"apps/web/app/routes/admin/onboarding/onboardings.$id/sessions.tsx",
"apps/web/app/routes/admin/onboarding/onboardings.$id/steps.tsx",
"apps/web/app/modules/onboarding/routes/components/sessions/OnboardingSessionsIndexRoute.tsx",
"apps/web/app/modules/onboarding/routes/components/sessions/OnboardingSessionOverviewRoute.tsx",
"apps/web/app/modules/onboarding/routes/components/OnboardingSummaryRoute.tsx",
"apps/web/app/modules/onboarding/routes/components/onboardings/OnboardingsIndexRoute.tsx",
"apps/web/app/modules/onboarding/components/OnboardingsList.tsx",
"apps/web/app/modules/onboarding/components/OnboardingSessionsTable.tsx",
"apps/web/app/modules/onboarding/utils/OnboardingSessionUtils.tsx",
"apps/web/app/modules/onboarding/blocks/grid/OnboardingGridForm.tsx",
];
const localeFiles = ["apps/web/public/locales/en/translations.json", "apps/web/public/locales/de/translations.json"];
function getNestedValue(source: Record<string, unknown>, path: string) {
return path.split(".").reduce<unknown>((value, segment) => {
if (!value || typeof value !== "object") {
return undefined;
}
return (value as Record<string, unknown>)[segment];
}, source);
}
describe("admin onboarding notices i18n", () => {
it("keeps active-state notices and filter modal labels behind semantic onboarding keys", () => {
const source = adminOnboardingFiles.map((file) => readRepoFile(file)).join("\n");
expect(source).toContain("onboarding.notices.cannotDeleteActive");
expect(source).toContain("onboarding.notices.cannotEditActive");
expect(source).toContain("onboarding.notices.activeVisible");
expect(source).toContain("onboarding.notices.inactiveSessions");
expect(source).toContain("onboarding.filter.description");
expect(source).toContain("onboarding.filter.actions.add");
expect(source).toContain("onboarding.object.types.modal");
expect(source).toContain("onboarding.object.types.page");
expect(source).toContain("onboarding.filter.realtime.title");
expect(source).toContain("onboarding.filter.realtime.description");
expect(source).toContain("onboarding.object.candidates");
expect(source).toContain("onboarding.filter.candidates.description");
expect(source).toContain("onboarding.filter.empty.allUsersCandidates");
expect(source).toContain("onboarding.session.saveCount");
expect(source).toContain("onboarding.session.plural");
expect(source).toContain("onboarding.session.description");
expect(source).toContain("onboarding.summary.sessions");
expect(source).toContain("onboarding.summary.latestSessions");
expect(source).toContain("onboarding.actions.create");
expect(source).toContain("onboarding.session.activityDescription");
expect(source).toContain("onboarding.session.activityEvents.started");
expect(source).toContain("onboarding.session.activityEvents.dismissed");
expect(source).toContain("onboarding.session.activityEvents.completed");
expect(source).toContain("onboarding.session.activityEvents.stepSeen");
expect(source).toContain("onboarding.session.activityEvents.stepCompleted");
expect(source).toContain("onboarding.session.activityEvents.descriptionColumn");
expect(source).toContain("onboarding.session.count");
expect(source).toContain("onboarding.session.statusCount.active");
expect(source).toContain("onboarding.session.statusCount.completed");
expect(source).toContain("onboarding.session.stepsCompletedCount");
expect(source).toContain("models.user.email");
expect(source).toContain("onboarding.block.grid.title");
expect(source).toContain("onboarding.block.grid.columnsOption");
expect(source).toContain("onboarding.block.grid.gapPlaceholder");
expect(source).toContain("useLocaleFormatters");
expect(source).toContain("formattedSessionCount");
expect(source).toContain('t("shared.clickHereTo", { action: t("shared.preview").toLowerCase() })');
expect(source).not.toContain("DateUtils");
expect(source).not.toContain("NumberUtils");
expect(source).not.toContain('t("onboarding.session.plural").toLowerCase()');
expect(source).not.toContain('t("onboarding.object.sessions.active").toLowerCase()');
expect(source).not.toContain('t("shared.completed").toLowerCase()');
expect(source).not.toContain("Email:");
expect(source).not.toContain("You cannot delete an active onboarding.");
expect(source).not.toContain("You cannot edit an active onboarding.");
expect(source).not.toContain("Current onboarding is not active, sessions will not be created/loaded.");
expect(source).not.toContain('"Add filter"');
expect(source).not.toContain('"Edit filter"');
expect(source).not.toContain('name: "Modal"');
expect(source).not.toContain('name: "Page"');
expect(source).not.toContain(">Sessions</h3>");
expect(source).not.toContain("Create onboarding");
expect(source).not.toContain("Latest sessions");
expect(source).not.toContain("Onboarding sessions");
expect(source).not.toContain("Matching filters ");
expect(source).not.toContain(">Grid</div>");
expect(source).not.toContain("column(s)");
expect(source).not.toContain('selectPlaceholder="Columns..."');
expect(source).not.toContain('selectPlaceholder="Gap..."');
expect(source).not.toContain('t("onboarding.prompts.updateSteps.title", { 0:');
expect(source).not.toContain('t("shared.clickHereTo", { 0:');
});
it.each(localeFiles)("defines the semantic onboarding notice keys in %s", (localeFile) => {
const translations = JSON.parse(readRepoFile(localeFile)) as Record<string, unknown>;
for (const key of [
"onboarding.notices.cannotDeleteActive",
"onboarding.notices.cannotEditActive",
"onboarding.notices.activeVisible",
"onboarding.notices.inactiveSessions",
"onboarding.session.saveCount_one",
"onboarding.session.saveCount_other",
"onboarding.session.plural",
"onboarding.session.count_one",
"onboarding.session.count_other",
"onboarding.session.statusCount.active_one",
"onboarding.session.statusCount.active_other",
"onboarding.session.statusCount.started_one",
"onboarding.session.statusCount.started_other",
"onboarding.session.statusCount.dismissed_one",
"onboarding.session.statusCount.dismissed_other",
"onboarding.session.statusCount.completed_one",
"onboarding.session.statusCount.completed_other",
"onboarding.session.stepsCompletedCount",
"onboarding.session.description",
"onboarding.summary.sessions",
"onboarding.summary.latestSessions",
"onboarding.actions.create",
"onboarding.session.activityDescription",
"onboarding.session.activityEvents.started",
"onboarding.session.activityEvents.dismissed",
"onboarding.session.activityEvents.completed",
"onboarding.session.activityEvents.stepSeen",
"onboarding.session.activityEvents.stepCompleted",
"onboarding.session.activityEvents.descriptionColumn",
"onboarding.filter.description",
"onboarding.filter.actions.add",
"onboarding.filter.actions.edit",
"onboarding.filter.realtime.title",
"onboarding.filter.realtime.description",
"onboarding.object.candidates",
"onboarding.object.types.modal",
"onboarding.object.types.page",
"onboarding.filter.candidates.description",
"onboarding.filter.empty.allUsersCandidates",
"onboarding.block.grid.title",
"onboarding.block.grid.columnsOption_one",
"onboarding.block.grid.columnsOption_other",
"onboarding.block.grid.columnsPlaceholder",
"onboarding.block.grid.gapOption",
"onboarding.block.grid.gapPlaceholder",
"onboarding.prompts.updateSteps.title_one",
"onboarding.prompts.updateSteps.title_other",
]) {
expect(getNestedValue(translations, key), `${localeFile} is missing ${key}`).toEqual(expect.any(String));
}
});
});
@@ -1,36 +0,0 @@
import { LoaderFunctionArgs } from "react-router";
import { getTranslations } from "~/locale/i18next.server";
import { getOnboardingSessionsWithPagination, OnboardingSessionWithDetails } from "../../db/onboardingSessions.db.server";
import { OnboardingFilterMetadataDto } from "../../dtos/OnboardingFilterMetadataDto";
import OnboardingService, { OnboardingSummaryDto } from "../../services/OnboardingService";
import { MetaTagsDto } from "~/application/dtos/seo/MetaTagsDto";
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
export namespace OnboardingSummaryApi {
export type LoaderData = {
meta: MetaTagsDto;
summary: OnboardingSummaryDto;
sessions: {
items: OnboardingSessionWithDetails[];
metadata: OnboardingFilterMetadataDto;
};
};
export const loader = async ({ request }: LoaderFunctionArgs) => {
await verifyUserHasPermission(request, "admin.onboarding.view");
const { t } = await getTranslations(request);
const data: LoaderData = {
meta: [{ title: `${t("onboarding.title")} | ${process.env.APP_NAME}` }],
summary: await OnboardingService.getSummary(),
sessions: {
items: (
await getOnboardingSessionsWithPagination({
pagination: { page: 1, pageSize: 10 },
})
).items,
metadata: await OnboardingService.getMetadata(),
},
};
return data;
};
}
@@ -1,82 +0,0 @@
import { ActionFunction, LoaderFunctionArgs, redirect } from "react-router";
import { getTranslations } from "~/locale/i18next.server";
import { getUserInfo, validateCSRFToken } from "~/utils/session.server";
import { createOnboarding, getOnboardings, OnboardingWithDetails } from "../../../db/onboarding.db.server";
import { MetaTagsDto } from "~/application/dtos/seo/MetaTagsDto";
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
import { adminPath } from "~/utils/app/CanonicalUrlUtils";
export namespace OnboardingIndexApi {
export type LoaderData = {
meta: MetaTagsDto;
items: OnboardingWithDetails[];
groupByStatus: { status: string; count: number }[];
};
export const loader = async ({ request }: LoaderFunctionArgs) => {
await verifyUserHasPermission(request, "admin.onboarding.view");
const { t } = await getTranslations(request);
const urlSearchParams = new URL(request.url).searchParams;
// const currentPagination = getPaginationFromCurrentUrl(urlSearchParams);
const status = urlSearchParams.get("status");
const items = await getOnboardings({
active: status === "active" ? true : status === "inactive" ? false : undefined,
});
const groupByStatus: { status: string; count: number }[] = [];
items.forEach((item) => {
if (item.active) {
const index = groupByStatus.findIndex((item) => item.status === "active");
if (index === -1) {
groupByStatus.push({ status: "active", count: 1 });
} else {
groupByStatus[index].count++;
}
} else if (!item.active) {
const index = groupByStatus.findIndex((item) => item.status === "inactive");
if (index === -1) {
groupByStatus.push({ status: "inactive", count: 1 });
} else {
groupByStatus[index].count++;
}
}
});
const data: LoaderData = {
meta: [{ title: `${t("onboarding.title")} | ${process.env.APP_NAME}` }],
items,
groupByStatus,
};
return data;
};
export type ActionData = {
error?: string;
};
export const action: ActionFunction = async ({ request }) => {
await verifyUserHasPermission(request, "admin.onboarding.update");
const { t } = await getTranslations(request);
await validateCSRFToken(request);
const form = await request.formData();
const userInfo = await getUserInfo(request);
const action = form.get("action");
if (action === "create") {
await verifyUserHasPermission(request, "admin.onboarding.create");
const title = form.get("title")?.toString() ?? "";
if (!title) {
return Response.json({ error: t("onboarding.errors.titleRequired") }, { status: 400 });
}
const onboarding = await createOnboarding({
title,
type: "modal",
active: false,
realtime: false,
canBeDismissed: true,
height: "xl",
filters: [{ type: "user.is", value: userInfo.userId }],
steps: [],
});
return redirect(adminPath(`onboarding/onboardings/${onboarding.id}`, { mode: "host-aware" }));
} else {
return Response.json({ error: t("shared.invalidForm") }, { status: 400 });
}
};
}
@@ -1,69 +0,0 @@
import { ActionFunction, LoaderFunctionArgs, redirect } from "react-router";
import { MetaTagsDto } from "~/application/dtos/seo/MetaTagsDto";
import { getTranslations } from "~/locale/i18next.server";
import {
deleteOnboardingSession,
getOnboardingSession,
OnboardingSessionWithDetails,
updateOnboardingSession,
} from "~/modules/onboarding/db/onboardingSessions.db.server";
import { OnboardingSessionStatus } from "~/modules/onboarding/dtos/OnboardingSessionStatus";
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
import { validateCSRFToken } from "~/utils/session.server";
import { adminPath } from "~/utils/app/CanonicalUrlUtils";
const onboardingSessionsPath = () => adminPath("onboarding/sessions", { mode: "host-aware" });
export namespace OnboardingSessionOverviewApi {
export type LoaderData = {
meta: MetaTagsDto;
item: OnboardingSessionWithDetails;
};
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
await verifyUserHasPermission(request, "admin.onboarding.view");
const { t } = await getTranslations(request);
const item = await getOnboardingSession(params.id!);
if (!item) {
throw redirect(onboardingSessionsPath());
}
const data: LoaderData = {
meta: [{ title: `${t("onboarding.session.object")} | ${process.env.APP_NAME}` }],
item,
};
return data;
};
export type ActionData = {
error?: string;
};
export const action: ActionFunction = async ({ request, params }) => {
await verifyUserHasPermission(request, "admin.onboarding.update");
const { t } = await getTranslations(request);
await validateCSRFToken(request);
const form = await request.formData();
const action = form.get("action");
const item = await getOnboardingSession(params.id!);
if (!item) {
return redirect(onboardingSessionsPath());
}
if (action === "update") {
const status = form.get("status")?.toString();
const startedAt = form.get("startedAt")?.toString();
const completedAt = form.get("completedAt")?.toString();
const dismissedAt = form.get("dismissedAt")?.toString();
await updateOnboardingSession(item.id, {
status: status !== undefined ? (status as OnboardingSessionStatus) : undefined,
startedAt: startedAt !== undefined ? new Date(startedAt) : undefined,
completedAt: completedAt !== undefined ? new Date(completedAt) : undefined,
dismissedAt: dismissedAt !== undefined ? new Date(dismissedAt) : undefined,
});
return Response.json({ success: true });
} else if (action === "delete") {
await verifyUserHasPermission(request, "admin.onboarding.delete");
await deleteOnboardingSession({ id: item.id, onboardingId: item.onboardingId });
return redirect(onboardingSessionsPath());
} else {
return Response.json({ error: t("shared.invalidForm") }, { status: 400 });
}
};
}
@@ -1,115 +0,0 @@
import { ActionFunction, LoaderFunctionArgs } from "react-router";
import { FilterablePropertyDto } from "~/application/dtos/data/FilterablePropertyDto";
import { PaginationDto } from "~/application/dtos/data/PaginationDto";
import { getTranslations } from "~/locale/i18next.server";
import { getOnboardings } from "~/modules/onboarding/db/onboarding.db.server";
import { deleteOnboardingSessionStepsInOnboardingSession } from "~/modules/onboarding/db/onboardingSessionSteps.db.server";
import { OnboardingFilterMetadataDto } from "~/modules/onboarding/dtos/OnboardingFilterMetadataDto";
import OnboardingService from "~/modules/onboarding/services/OnboardingService";
import { adminGetAllTenantsIdsAndNames } from "~/utils/db/tenants.db.server";
import { getUsersById } from "~/utils/db/users.db.server";
import { getFiltersFromCurrentUrl, getPaginationFromCurrentUrl } from "~/utils/helpers/RowPaginationHelper";
import {
deleteOnboardingSession,
getOnboardingSessionInOnboarding,
getOnboardingSessionsWithPagination,
groupOnboardingSessionsByUser,
OnboardingSessionWithDetails,
} from "../../../db/onboardingSessions.db.server";
import { MetaTagsDto } from "~/application/dtos/seo/MetaTagsDto";
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
import { validateCSRFToken } from "~/utils/session.server";
export namespace OnboardingSessionsIndexApi {
export type LoaderData = {
meta: MetaTagsDto;
items: OnboardingSessionWithDetails[];
pagination: PaginationDto;
filterableProperties: FilterablePropertyDto[];
metadata: OnboardingFilterMetadataDto;
};
export const loader = async ({ request, params }: LoaderFunctionArgs) => {
await verifyUserHasPermission(request, "admin.onboarding.view");
const { t } = await getTranslations(request);
const allOnboardings = await getOnboardings({});
const usersInSessions = await groupOnboardingSessionsByUser();
const users = await getUsersById(usersInSessions.map((x) => x.userId));
const filterableProperties: FilterablePropertyDto[] = [
{
name: "onboardingId",
title: t("onboarding.title"),
options: [
...allOnboardings.map((i) => {
return { value: i.id, name: i.title };
}),
],
},
{
name: "userId",
title: t("models.user.object"),
options: [
...users.map((i) => {
return { value: i.id, name: i.email + " - " + i.firstName + " " + i.lastName };
}),
],
},
{
name: "tenantId",
title: t("models.tenant.object"),
options: [
{ name: "{Admin}", value: "null" },
...(await adminGetAllTenantsIdsAndNames()).map((i) => {
return { value: i.id, name: i.name };
}),
],
},
];
const filters = getFiltersFromCurrentUrl(request, filterableProperties);
const urlSearchParams = new URL(request.url).searchParams;
const currentPagination = getPaginationFromCurrentUrl(urlSearchParams);
const tenantId = filters.properties.find((f) => f.name === "tenantId")?.value;
const { items, pagination } = await getOnboardingSessionsWithPagination({
pagination: currentPagination,
where: {
onboardingId: params.id,
tenantId: tenantId === "null" ? null : tenantId ?? undefined,
},
});
const data: LoaderData = {
meta: [{ title: `${t("onboarding.title")} | ${process.env.APP_NAME}` }],
items,
pagination,
filterableProperties,
metadata: await OnboardingService.getMetadata(),
};
return data;
};
export type ActionData = {
error?: string;
success?: string;
};
export const action: ActionFunction = async ({ request, params }) => {
await verifyUserHasPermission(request, "admin.onboarding.update");
const { t } = await getTranslations(request);
await validateCSRFToken(request);
const form = await request.formData();
const action = form.get("action");
if (action === "delete") {
await verifyUserHasPermission(request, "admin.onboarding.delete");
const id = form.get("id")?.toString() ?? "";
if (!id) {
return Response.json({ error: t("onboarding.session.errors.idRequired") }, { status: 400 });
}
const session = await getOnboardingSessionInOnboarding({ id, onboardingId: params.id! });
if (!session) {
return Response.json({ error: t("shared.notFound") }, { status: 404 });
}
await deleteOnboardingSessionStepsInOnboardingSession({ onboardingSessionId: session.id, onboardingId: params.id! });
await deleteOnboardingSession({ id, onboardingId: params.id! });
return Response.json({ success: t("onboarding.session.deleted") });
} else {
return Response.json({ error: t("shared.invalidForm") }, { status: 400 });
}
};
}
@@ -1,151 +0,0 @@
import type { LoaderFunctionArgs } from "react-router";
import { beforeEach, describe, expect, it, vi } from "vitest";
import { getTranslations } from "~/locale/i18next.server";
import { getOnboardings } from "~/modules/onboarding/db/onboarding.db.server";
import {
deleteOnboardingSession,
getOnboardingSessionInOnboarding,
getOnboardingSessionsWithPagination,
groupOnboardingSessionsByUser,
} from "~/modules/onboarding/db/onboardingSessions.db.server";
import { deleteOnboardingSessionStepsInOnboardingSession } from "~/modules/onboarding/db/onboardingSessionSteps.db.server";
import OnboardingService from "~/modules/onboarding/services/OnboardingService";
import { adminGetAllTenantsIdsAndNames } from "~/utils/db/tenants.db.server";
import { getUsersById } from "~/utils/db/users.db.server";
import { getFiltersFromCurrentUrl, getPaginationFromCurrentUrl } from "~/utils/helpers/RowPaginationHelper";
import { verifyUserHasPermission } from "~/utils/helpers/.server/PermissionsService";
import { validateCSRFToken } from "~/utils/session.server";
import { OnboardingSessionsIndexApi } from "./OnboardingSessionsIndexApi.server";
vi.mock("~/locale/i18next.server", () => ({ getTranslations: vi.fn() }));
vi.mock("~/modules/onboarding/db/onboarding.db.server", () => ({ getOnboardings: vi.fn() }));
vi.mock("~/modules/onboarding/db/onboardingSessionSteps.db.server", () => ({ deleteOnboardingSessionStepsInOnboardingSession: vi.fn() }));
vi.mock("~/modules/onboarding/db/onboardingSessions.db.server", () => ({
deleteOnboardingSession: vi.fn(),
getOnboardingSessionInOnboarding: vi.fn(),
getOnboardingSessionsWithPagination: vi.fn(),
groupOnboardingSessionsByUser: vi.fn(),
}));
vi.mock("~/modules/onboarding/services/OnboardingService", () => ({ default: { getMetadata: vi.fn() } }));
vi.mock("~/utils/db/tenants.db.server", () => ({ adminGetAllTenantsIdsAndNames: vi.fn() }));
vi.mock("~/utils/db/users.db.server", () => ({ getUsersById: vi.fn() }));
vi.mock("~/utils/helpers/RowPaginationHelper", () => ({ getFiltersFromCurrentUrl: vi.fn(), getPaginationFromCurrentUrl: vi.fn() }));
vi.mock("~/utils/helpers/.server/PermissionsService", () => ({ verifyUserHasPermission: vi.fn() }));
vi.mock("~/utils/session.server", () => ({ validateCSRFToken: vi.fn() }));
const mockedGetTranslations = vi.mocked(getTranslations);
const mockedGetOnboardings = vi.mocked(getOnboardings);
const mockedGroupOnboardingSessionsByUser = vi.mocked(groupOnboardingSessionsByUser);
const mockedGetUsersById = vi.mocked(getUsersById);
const mockedAdminGetAllTenantsIdsAndNames = vi.mocked(adminGetAllTenantsIdsAndNames);
const mockedGetFiltersFromCurrentUrl = vi.mocked(getFiltersFromCurrentUrl);
const mockedGetPaginationFromCurrentUrl = vi.mocked(getPaginationFromCurrentUrl);
const mockedGetOnboardingSessionsWithPagination = vi.mocked(getOnboardingSessionsWithPagination);
const mockedGetOnboardingSessionInOnboarding = vi.mocked(getOnboardingSessionInOnboarding);
const mockedDeleteOnboardingSessionStepsInOnboardingSession = vi.mocked(deleteOnboardingSessionStepsInOnboardingSession);
const mockedDeleteOnboardingSession = vi.mocked(deleteOnboardingSession);
const mockedGetMetadata = vi.mocked(OnboardingService.getMetadata);
const mockedVerifyUserHasPermission = vi.mocked(verifyUserHasPermission);
const mockedValidateCSRFToken = vi.mocked(validateCSRFToken);
function requestWithTenantFilter(tenantId?: string) {
const url = new URL("https://admin.example.test/onboardings/onboarding-1/sessions");
if (tenantId !== undefined) {
url.searchParams.set("tenantId", tenantId);
}
return new Request(url);
}
async function callLoader(tenantFilterValue: string | null) {
mockedGetFiltersFromCurrentUrl.mockReturnValue({
query: undefined,
properties: [
{ name: "onboardingId", title: "onboarding.title", options: [], value: null },
{ name: "userId", title: "models.user.object", options: [], value: null },
{ name: "tenantId", title: "models.tenant.object", options: [], value: tenantFilterValue },
],
});
await OnboardingSessionsIndexApi.loader({
request: requestWithTenantFilter(tenantFilterValue ?? undefined),
params: { id: "onboarding-1" },
context: {},
} as unknown as LoaderFunctionArgs);
}
describe("OnboardingSessionsIndexApi tenant filter composition", () => {
beforeEach(() => {
vi.clearAllMocks();
mockedVerifyUserHasPermission.mockResolvedValue(undefined as any);
mockedGetTranslations.mockResolvedValue({ t: (key: string) => key } as any);
mockedGetOnboardings.mockResolvedValue([{ id: "onboarding-1", title: "Tenant onboarding" }] as any);
mockedGroupOnboardingSessionsByUser.mockResolvedValue([{ userId: "user-1" }] as any);
mockedGetUsersById.mockResolvedValue([{ id: "user-1", email: "user@example.test", firstName: "User", lastName: "One" }] as any);
mockedAdminGetAllTenantsIdsAndNames.mockResolvedValue([{ id: "tenant-1", name: "Tenant One" }] as any);
mockedGetPaginationFromCurrentUrl.mockReturnValue({ page: 2, pageSize: 25, sortedBy: [], query: "" });
mockedGetOnboardingSessionsWithPagination.mockResolvedValue({
items: [],
pagination: { page: 2, pageSize: 25, totalItems: 0, totalPages: 0 },
} as any);
mockedValidateCSRFToken.mockResolvedValue(undefined as never);
mockedGetMetadata.mockResolvedValue({} as any);
});
it("maps the admin {Admin} tenant filter to null while preserving the onboarding id", async () => {
await callLoader("null");
expect(mockedGetOnboardingSessionsWithPagination).toHaveBeenCalledWith({
pagination: { page: 2, pageSize: 25, sortedBy: [], query: "" },
where: {
onboardingId: "onboarding-1",
tenantId: null,
},
});
});
it("passes a concrete tenant filter through while preserving the onboarding id", async () => {
await callLoader("tenant-1");
expect(mockedGetOnboardingSessionsWithPagination).toHaveBeenCalledWith({
pagination: { page: 2, pageSize: 25, sortedBy: [], query: "" },
where: {
onboardingId: "onboarding-1",
tenantId: "tenant-1",
},
});
});
it("leaves tenantId undefined when no tenant filter is selected", async () => {
await callLoader(null);
expect(mockedGetOnboardingSessionsWithPagination).toHaveBeenCalledWith({
pagination: { page: 2, pageSize: 25, sortedBy: [], query: "" },
where: {
onboardingId: "onboarding-1",
tenantId: undefined,
},
});
});
it("scopes session deletes to the current onboarding before deleting child steps", async () => {
mockedGetOnboardingSessionInOnboarding.mockResolvedValue({ id: "session-1", sessionSteps: [{ id: "step-1" }] } as any);
const response = await OnboardingSessionsIndexApi.action({
request: new Request("https://admin.example.test/onboardings/onboarding-1/sessions", {
method: "POST",
headers: { "Content-Type": "application/x-www-form-urlencoded" },
body: new URLSearchParams({ action: "delete", id: "session-1" }).toString(),
}),
params: { id: "onboarding-1" },
context: {},
} as any);
expect(response.status).toBe(200);
expect(mockedGetOnboardingSessionInOnboarding).toHaveBeenCalledWith({ id: "session-1", onboardingId: "onboarding-1" });
expect(mockedDeleteOnboardingSessionStepsInOnboardingSession).toHaveBeenCalledWith({
onboardingSessionId: "session-1",
onboardingId: "onboarding-1",
});
expect(mockedDeleteOnboardingSession).toHaveBeenCalledWith({ id: "session-1", onboardingId: "onboarding-1" });
});
});
@@ -1,48 +0,0 @@
import { useTranslation } from "react-i18next";
import { useLocaleFormatters } from "~/locale/format";
import OnboardingSessionsTable from "../../components/OnboardingSessionsTable";
import { OnboardingSummaryApi } from "../api/OnboardingSummaryApi.server";
import { useLoaderData } from "react-router";
export default function () {
const { t } = useTranslation();
const formatters = useLocaleFormatters();
const data = useLoaderData<OnboardingSummaryApi.LoaderData>();
return (
<div className="mx-auto mb-12 max-w-5xl space-y-5 px-4 py-4 sm:px-6 lg:px-8 xl:max-w-7xl">
<div className="border-border border-b pb-5">
<h3 className="text-foreground text-lg leading-6 font-medium">{t("shared.overview")}</h3>
</div>
<dl className="grid gap-2 sm:grid-cols-3">
<div className="bg-card border-border overflow-hidden rounded-lg border px-4 py-3 shadow-xs">
<dt className="text-muted-foreground truncate text-xs font-medium uppercase">
<div>{t("onboarding.summary.sessions")}</div>
</dt>
<dd className="text-foreground mt-1 flex items-baseline space-x-1 truncate text-2xl font-semibold">
<div>
{formatters.number(data.summary.sessions.active)}/{formatters.number(data.summary.sessions.all)}
</div>
<div className="text-muted-foreground text-sm font-normal lowercase">{t("shared.active")}</div>
</dd>
</div>
<div className="bg-card border-border overflow-hidden rounded-lg border px-4 py-3 shadow-xs">
<dt className="text-muted-foreground truncate text-xs font-medium uppercase">
<div>{t("onboarding.object.sessions.dismissed")}</div>
</dt>
<dd className="text-foreground mt-1 truncate text-2xl font-semibold">{formatters.number(data.summary.sessions.dismissed)}</dd>
</div>
<div className="bg-card border-border overflow-hidden rounded-lg border px-4 py-3 shadow-xs">
<dt className="text-muted-foreground truncate text-xs font-medium uppercase">
<div>{t("onboarding.object.sessions.completed")}</div>
</dt>
<dd className="text-foreground mt-1 truncate text-2xl font-semibold">{formatters.number(data.summary.sessions.completed)}</dd>
</div>
</dl>
<div className="mt-4 space-y-4">
<h3 className="text-foreground leading-4 font-medium">{t("onboarding.summary.latestSessions")}</h3>
<OnboardingSessionsTable items={data.sessions.items} metadata={data.sessions.metadata} />
</div>
</div>
);
}
@@ -1,95 +0,0 @@
import { Form, useLoaderData, useSearchParams } from "react-router";
import { useState } from "react";
import { useTranslation } from "react-i18next";
import ButtonPrimary from "~/components/ui/buttons/ButtonPrimary";
import ButtonSecondary from "~/components/ui/buttons/ButtonSecondary";
import LoadingButton from "~/components/ui/buttons/LoadingButton";
import PlusIcon from "~/components/ui/icons/PlusIcon";
import InputText from "~/components/ui/input/InputText";
import Modal from "~/components/ui/modals/Modal";
import TabsWithIcons from "~/components/ui/tabs/TabsWithIcons";
import OnboardingsList from "../../../components/OnboardingsList";
import { OnboardingIndexApi } from "../../api/onboardings/OnboardingsIndexApi.server";
export default function () {
const { t } = useTranslation();
const data = useLoaderData<OnboardingIndexApi.LoaderData>();
const [searchParams] = useSearchParams();
const [adding, setAdding] = useState(false);
function countStatus(status?: string) {
if (!status) {
let total = 0;
data?.groupByStatus.forEach((item) => {
total += item.count;
});
return total;
}
const item = data?.groupByStatus.find((item) => item.status === status);
return item ? item.count : 0;
}
return (
<div className="mx-auto mb-12 max-w-5xl space-y-5 px-4 py-4 sm:px-6 lg:px-8 xl:max-w-7xl">
<div className="flex items-center justify-between space-x-2">
<div className="grow">
<TabsWithIcons
tabs={[
{
name: `${t("shared.all")} ${countStatus() ? `(${countStatus()})` : ""}`,
href: "?",
current: !searchParams.get("status") || searchParams.get("status") === "all",
},
{
name: `${t("shared.active")} ${countStatus("active") ? `(${countStatus("active")})` : ""}`,
href: "?status=active",
current: searchParams.get("status") === "active",
},
{
name: `${t("shared.inactive")} ${countStatus("inactive") ? `(${countStatus("inactive")})` : ""}`,
href: "?status=inactive",
current: searchParams.get("status") === "inactive",
},
]}
/>
</div>
<div>
<ButtonPrimary onClick={() => setAdding(true)}>
<div>{t("shared.new")}</div>
<PlusIcon className="h-5 w-5" />
</ButtonPrimary>
</div>
</div>
<OnboardingsList items={data.items} groupByStatus={data.groupByStatus} />
<AddOnboardingModal open={adding} onClose={() => setAdding(false)} />
</div>
);
}
function AddOnboardingModal({ open, onClose }: { open: boolean; onClose: () => void }) {
const { t } = useTranslation();
const [title, setTitle] = useState("");
return (
<Modal open={open} setOpen={onClose} size="md">
<Form method="post" className="bg-background inline-block w-full overflow-hidden p-1 text-left align-bottom sm:align-middle">
<input name="action" type="hidden" value="create" readOnly hidden />
<div className="mt-3 text-center sm:mt-5">
<h3 className="text-foreground text-lg font-medium leading-6">{t("onboarding.actions.create")}</h3>
</div>
<div className="mt-4 space-y-2">
<InputText name="title" title={t("onboarding.object.title")} value={title} setValue={(e) => setTitle(e)} required />
</div>
<div className="border-border mt-3 grid grid-cols-2 gap-3 border-t pt-3">
<ButtonSecondary type="button" onClick={onClose} className="flex w-full justify-center">
{t("shared.back")}
</ButtonSecondary>
<LoadingButton type="submit" className="flex w-full justify-center">
{t("shared.create")}
</LoadingButton>
</div>
</Form>
</Modal>
);
}
@@ -1,15 +0,0 @@
import { useLoaderData } from "react-router";
import { useTranslation } from "react-i18next";
import { OnboardingSessionOverviewApi } from "../../api/sessions/OnboardingSessionOverviewApi.server";
export default function () {
const { t } = useTranslation();
const data = useLoaderData<OnboardingSessionOverviewApi.LoaderData>();
return (
<div>
<div>
{t("models.user.email")}: {data.item.user.email}
</div>
</div>
);
}
@@ -1,53 +0,0 @@
import { useActionData, useLoaderData, useSubmit } from "react-router";
import { useRef } from "react";
import { useTranslation } from "react-i18next";
import InputFilters from "~/components/ui/input/InputFilters";
import ActionResultModal from "~/components/ui/modals/ActionResultModal";
import ConfirmModal, { RefConfirmModal } from "~/components/ui/modals/ConfirmModal";
import OnboardingSessionsTable from "~/modules/onboarding/components/OnboardingSessionsTable";
import { OnboardingSessionWithDetails } from "~/modules/onboarding/db/onboardingSessions.db.server";
import { OnboardingSessionsIndexApi } from "../../api/sessions/OnboardingSessionsIndexApi.server";
export default function () {
const { t } = useTranslation();
const data = useLoaderData<OnboardingSessionsIndexApi.LoaderData>();
const actionData = useActionData<OnboardingSessionsIndexApi.ActionData>();
const submit = useSubmit();
const modalConfirmDelete = useRef<RefConfirmModal>(null);
function onDelete(item: OnboardingSessionWithDetails) {
modalConfirmDelete.current?.setValue(item.id);
modalConfirmDelete.current?.show(
t("onboarding.prompts.deleteSession.title"),
t("shared.confirm"),
t("shared.back"),
t("onboarding.prompts.deleteSession.description")
);
}
function onConfirmDelete(id: string) {
const form = new FormData();
form.set("action", "delete");
form.set("id", id);
submit(form, {
method: "post",
});
}
return (
<>
<div className="md:border-border md:border-b md:py-2">
<div className="flex items-center justify-between">
<h3 className="text-foreground text-lg font-medium leading-6">{t("onboarding.session.plural")}</h3>
<div className="flex items-center space-x-2">
<InputFilters filters={data.filterableProperties} />
</div>
</div>
</div>
<OnboardingSessionsTable items={data.items} metadata={data.metadata} onDelete={onDelete} />
<ConfirmModal ref={modalConfirmDelete} onYes={onConfirmDelete} />
<ActionResultModal actionData={actionData} showSuccess={false} />
</>
);
}
@@ -1,6 +1,6 @@
import { describe, expect, it, vi } from "vitest";
vi.mock("@toolctrl/db/api-keys.server", () => ({
vi.mock("@hivegrid/db/api-keys.server", () => ({
countLegacyTenantApiKeyLogs: vi.fn(),
}));
@@ -8,10 +8,6 @@ vi.mock("~/locale/i18n", () => ({
i18nConfig: { supportedLngs: ["en"] },
}));
vi.mock("~/utils/api/.server/RowsApi", () => ({
RowsApi: { count: vi.fn() },
}));
vi.mock("~/utils/db/permissions/userRoles.db.server", () => ({
getUserRoles: vi.fn(async () => []),
}));
@@ -1,7 +1,6 @@
import { countLegacyTenantApiKeyLogs as countTenantApiKeyLogs } from "@toolctrl/db/api-keys.server";
import { OnboardingFilter } from "@toolctrl/db/prisma-browser";
import { countLegacyTenantApiKeyLogs as countTenantApiKeyLogs } from "@hivegrid/db/api-keys.server";
import { OnboardingFilter } from "@hivegrid/db/prisma-browser";
import { i18nConfig } from "~/locale/i18n";
import { RowsApi } from "~/utils/api/.server/RowsApi";
import { getUserRoles } from "~/utils/db/permissions/userRoles.db.server";
import { getTenantUsers } from "~/utils/db/tenants.db.server";
import { getUser } from "~/utils/db/users.db.server";
@@ -71,24 +70,6 @@ async function matches({ userId, tenantId, filter }: { userId: string; tenantId:
} else {
return apiKeyLogs === 0;
}
case "tenant.user.entity.hasCreated":
case "tenant.user.entity.hasNotCreated":
try {
const rowsCreated = await RowsApi.count({
entity: { id: value ?? "" },
tenantId: tenantId ?? "",
userId,
});
if (type === "tenant.user.entity.hasCreated") {
return rowsCreated > 0;
} else if (type === "tenant.user.entity.hasNotCreated") {
return rowsCreated === 0;
} else {
throw new Error(`Unknown onboarding filter: ${type}`);
}
} catch {
return false;
}
default:
throw new Error(`Unknown onboarding filter: ${type}`);
}
@@ -1,5 +1,5 @@
import { beforeEach, describe, expect, it, vi } from "vitest";
import type { OnboardingFilter, OnboardingSession } from "@toolctrl/db/prisma-browser";
import type { OnboardingFilter, OnboardingSession } from "@hivegrid/db/prisma-browser";
import OnboardingService from "./OnboardingService";
import { createOnboardingSession, getOnboardings } from "../db/onboarding.db.server";
import { getOnboardingSession, getOnboardingSessionsByUser } from "../db/onboardingSessions.db.server";
@@ -11,10 +11,6 @@ vi.mock("~/utils/db/appConfiguration.db.server", () => ({
getAppConfiguration: vi.fn(async () => ({ onboarding: { enabled: true } })),
}));
vi.mock("~/utils/db/entities/entities.db.server", () => ({
getAllEntities: vi.fn(),
}));
vi.mock("~/utils/db/permissions/roles.db.server", () => ({
getAllRoles: vi.fn(),
}));
@@ -1,6 +1,5 @@
import { OnboardingFilter, OnboardingSession } from "@toolctrl/db/prisma-browser";
import { OnboardingFilter, OnboardingSession } from "@hivegrid/db/prisma-browser";
import { getAppConfiguration } from "~/utils/db/appConfiguration.db.server";
import { getAllEntities } from "~/utils/db/entities/entities.db.server";
import { getAllRoles } from "~/utils/db/permissions/roles.db.server";
import { getAllSubscriptionProducts } from "~/utils/db/subscriptionProducts.db.server";
import { adminGetAllTenants, getAllTenantUsers } from "~/utils/db/tenants.db.server";
@@ -222,7 +221,6 @@ async function getMetadata(): Promise<OnboardingFilterMetadataDto> {
return {
users: (await adminGetAllUsers()).items,
tenants: await adminGetAllTenants(),
entities: await getAllEntities({ tenantId: null }),
subscriptionProducts: await getAllSubscriptionProducts(),
roles: await getAllRoles(),
};
@@ -1,5 +1,5 @@
import type { Params } from "react-router";
import type { EntitlementDecision } from "@toolctrl/entitlements";
import type { EntitlementDecision } from "@hivegrid/entitlements";
import type {
SubscriptionEntitlementSubscription,
SubscriptionEntitlementTrialState,
@@ -1,4 +1,4 @@
import { OnboardingFilter } from "@toolctrl/db/prisma-browser";
import { OnboardingFilter } from "@hivegrid/db/prisma-browser";
import { i18nConfig } from "~/locale/i18n";
import { OnboardingFilterDto } from "../dtos/OnboardingFilterDto";
import { OnboardingFilterMetadataDto } from "../dtos/OnboardingFilterMetadataDto";
@@ -29,9 +29,6 @@ function parseValue({ t, filter, metadata }: { t: TFunction; filter: OnboardingF
} else if (filter.type.startsWith("user.roles")) {
const role = metadata.roles.find((r) => r.name === filter.value);
return role?.name;
} else if (filter.type.startsWith("tenant.user.entity")) {
const entity = metadata.entities.find((t) => t.id === filter.value);
return entity?.name;
} else if (filter.type.startsWith("user.language")) {
const language = i18nConfig.supportedLngs.find((l) => l === filter.value);
return language;
@@ -1,4 +1,4 @@
import { OnboardingStep } from "@toolctrl/db/prisma-browser";
import { OnboardingStep } from "@hivegrid/db/prisma-browser";
import { OnboardingStepBlockDto } from "../blocks/OnboardingBlockUtils";
import { t as i18nT } from "i18next";