Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions apps/admin/app/(all)/(dashboard)/general/form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { UsageOutline } from "@makeplane/propel/icons";
import { Button } from "@makeplane/propel/components/button";
import { Input } from "@makeplane/propel/components/input";
import { Switch } from "@makeplane/propel/components/switch";
import { DOCS_URL, externalLink } from "@pace/constants";
import type { IInstance, IInstanceAdmin } from "@pace/types";
// components
import { ControllerInput } from "@/components/common/controller-input";
Expand All @@ -19,6 +20,8 @@ import { TOAST_TYPE, setToast } from "@/providers/toast";
import { useTranslation } from "@pace/i18n";
import { useInstance } from "@/hooks/store";

const telemetryPolicyLink = externalLink(DOCS_URL, "/self-hosting/telemetry");

export interface IGeneralConfigurationForm {
instance: IInstance;
instanceAdmins: IInstanceAdmin[];
Expand Down Expand Up @@ -113,16 +116,23 @@ export const GeneralConfigurationForm = observer(function GeneralConfigurationFo
{t("admin.general.telemetry.description")}
</div>
<div className="text-11 leading-5 font-regular text-tertiary">
No PII is collected.This anonymized data is used to understand how you use Plane and build new features
in line with{" "}
<a
href="https://pace.yldm.ai/docs/self-hosting/telemetry"
target="_blank"
className="text-accent-primary hover:underline"
rel="noreferrer"
>
our Telemetry Policy.
</a>
{/* The sentence carries the actual disclosure -- no PII, anonymous, used for feature work -- so it stays either way. What goes with the link is the clause that cites the policy document: naming a Telemetry Policy the reader cannot open claims a document this installation may not publish. Upstream this page linked developers.plane.so, and the docs site is the closest equivalent a fork configures. */}
{telemetryPolicyLink ? (
<>
No PII is collected. This anonymized data is used to understand how you use Plane and build new
features in line with{" "}
<a
href={telemetryPolicyLink}
target="_blank"
className="text-accent-primary hover:underline"
rel="noreferrer"
>
our Telemetry Policy.
</a>
</>
) : (
"No PII is collected. This anonymized data is used to understand how you use Plane and build new features."
)}
</div>
</div>
</div>
Expand Down
9 changes: 5 additions & 4 deletions apps/admin/app/(all)/(dashboard)/sidebar-help-section.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { useState, useRef } from "react";
import { observer } from "mobx-react";
import Link from "@/app/hooks/link";
import { Transition } from "@headlessui/react";
import { WEB_BASE_URL } from "@pace/constants";
import { DOCS_URL, FORUM_URL, WEB_BASE_URL } from "@pace/constants";
// pace internal packages
import { Tooltip } from "@makeplane/propel/components/tooltip";
import { LanguageSwitcher } from "@/components/common/language-switcher";
Expand All @@ -27,23 +27,24 @@ import { useInstance, useTheme } from "@/hooks/store";
// assets

// `name` holds a translation key, not text: this list lives outside the component and so cannot call the translation hook. The keys are resolved where the options are rendered, below.
// Entries whose href is empty are dropped: the documentation and forum sites are per-installation configuration and this fork ships without either, so the alternative is a menu entry that navigates nowhere.
const helpOptions = [
{
name: "admin.nav.documentation",
href: "https://pace.yldm.ai/docs/",
href: DOCS_URL,
Icon: PagesOutline,
},
{
name: "admin.nav.forum",
href: "https://pace.yldm.ai/forum",
href: FORUM_URL,
Icon: ChatOutline,
},
{
name: "admin.nav.report_bug",
href: "https://github.com/makeplane/plane/issues/new/choose",
Icon: Github,
},
];
].filter((option) => !!option.href);

export const AdminSidebarHelpSection = observer(function AdminSidebarHelpSection() {
// i18n
Expand Down
28 changes: 18 additions & 10 deletions apps/admin/core/components/instance/setup-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { useSearchParams } from "@/app/hooks/navigation";
// icons
import { HideOutline, ShowOutline } from "@makeplane/propel/icons";
// pace internal packages
import { API_BASE_URL, E_PASSWORD_STRENGTH } from "@pace/constants";
import { API_BASE_URL, DOCS_URL, E_PASSWORD_STRENGTH, externalLink } from "@pace/constants";
import { Button } from "@makeplane/propel/components/button";
import { Checkbox } from "@makeplane/propel/components/checkbox";
import { Input, InputGroup } from "@makeplane/propel/components/input";
Expand All @@ -25,6 +25,8 @@ import { useTranslation } from "@pace/i18n";
// service initialization
const authService = new AuthService();

const telemetryPolicyLink = externalLink(DOCS_URL, "/self-hosting/telemetry");

// error codes
enum EErrorCodes {
INSTANCE_NOT_CONFIGURED = "INSTANCE_NOT_CONFIGURED",
Expand Down Expand Up @@ -354,15 +356,21 @@ export function InstanceSetupForm() {
/>
</div>
<label className="cursor-pointer text-13 font-medium text-tertiary" htmlFor="is_telemetry_enabled">
{t("admin.setup.telemetry")}{" "}
<a
href="https://pace.yldm.ai/docs/self-hosting/telemetry"
target="_blank"
rel="noopener noreferrer"
className="text-blue-500 hover:text-blue-600 flex-shrink-0 text-13 font-medium"
>
{t("admin.common.see_more")}
</a>
{t("admin.setup.telemetry")}
{/* The label itself says what the checkbox does -- it collects usage events anonymously -- so it needs no rewording when the "See More" link goes. Only the pointer at the telemetry documentation depends on this installation having a docs site. */}
{telemetryPolicyLink && (
<>
{" "}
<a
href={telemetryPolicyLink}
target="_blank"
rel="noopener noreferrer"
className="text-blue-500 hover:text-blue-600 flex-shrink-0 text-13 font-medium"
>
{t("admin.common.see_more")}
</a>
</>
)}
</label>
</div>

Expand Down
2 changes: 1 addition & 1 deletion apps/admin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "admin",
"version": "1.4.37",
"version": "1.4.38",
"private": true,
"description": "Admin UI for Pace",
"license": "AGPL-3.0",
Expand Down
Loading
Loading