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
19 changes: 2 additions & 17 deletions apps/admin/app/(all)/(dashboard)/general/form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ import { Input, ToggleSwitch } from "@plane/ui";
import { ControllerInput } from "@/components/common/controller-input";
// hooks
import { useInstance } from "@/hooks/store";
// components
import { IntercomConfig } from "./intercom";

export interface IGeneralConfigurationForm {
instance: IInstance;
Expand All @@ -27,14 +25,13 @@ export interface IGeneralConfigurationForm {
export const GeneralConfigurationForm = observer(function GeneralConfigurationForm(props: IGeneralConfigurationForm) {
const { instance, instanceAdmins } = props;
// hooks
const { instanceConfigurations, updateInstanceInfo, updateInstanceConfigurations } = useInstance();
const { updateInstanceInfo } = useInstance();

// form data
const {
handleSubmit,
control,
formState: { errors, isSubmitting },
watch,
} = useForm<Partial<IInstance>>({
defaultValues: {
instance_name: instance?.instance_name,
Expand All @@ -45,17 +42,6 @@ export const GeneralConfigurationForm = observer(function GeneralConfigurationFo
const onSubmit = async (formData: Partial<IInstance>) => {
const payload: Partial<IInstance> = { ...formData };

// update the intercom configuration
const isIntercomEnabled =
instanceConfigurations?.find((config) => config.key === "IS_INTERCOM_ENABLED")?.value === "1";
if (!payload.is_telemetry_enabled && isIntercomEnabled) {
try {
await updateInstanceConfigurations({ IS_INTERCOM_ENABLED: "0" });
} catch (error) {
console.error(error);
}
}

await updateInstanceInfo(payload)
.then(() =>
setToast({
Expand Down Expand Up @@ -112,8 +98,7 @@ export const GeneralConfigurationForm = observer(function GeneralConfigurationFo
</div>

<div className="space-y-6">
<div className="border-b border-subtle pb-1.5 text-16 font-medium text-primary">Chat + telemetry</div>
<IntercomConfig isTelemetryEnabled={watch("is_telemetry_enabled") ?? false} />
<div className="border-b border-subtle pb-1.5 text-16 font-medium text-primary">Telemetry</div>
<div className="flex items-center gap-14">
<div className="flex grow items-center gap-4">
<div className="shrink-0">
Expand Down
86 changes: 0 additions & 86 deletions apps/admin/app/(all)/(dashboard)/general/intercom.tsx

This file was deleted.

15 changes: 0 additions & 15 deletions apps/api/plane/license/api/views/instance.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ def get(self, request):
POSTHOG_HOST,
UNSPLASH_ACCESS_KEY,
LLM_API_KEY,
IS_INTERCOM_ENABLED,
INTERCOM_APP_ID,
) = get_configuration_value(
[
{
Expand Down Expand Up @@ -124,15 +122,6 @@ def get(self, request):
"key": "LLM_API_KEY",
"default": os.environ.get("LLM_API_KEY", ""),
},
# Intercom settings
{
"key": "IS_INTERCOM_ENABLED",
"default": os.environ.get("IS_INTERCOM_ENABLED", "1"),
},
{
"key": "INTERCOM_APP_ID",
"default": os.environ.get("INTERCOM_APP_ID", ""),
},
]
)

Expand Down Expand Up @@ -169,10 +158,6 @@ def get(self, request):
# is smtp configured
data["is_smtp_configured"] = bool(EMAIL_HOST)

# Intercom settings
data["is_intercom_enabled"] = IS_INTERCOM_ENABLED == "1"
data["intercom_app_id"] = INTERCOM_APP_ID

# Base URL
data["admin_base_url"] = settings.ADMIN_BASE_URL
data["space_base_url"] = settings.SPACE_BASE_URL
Expand Down
16 changes: 0 additions & 16 deletions apps/api/plane/utils/instance_config_variables/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,21 +232,6 @@
},
]

intercom_config_variables = [
{
"key": "IS_INTERCOM_ENABLED",
"value": os.environ.get("IS_INTERCOM_ENABLED", "1"),
"category": "INTERCOM",
"is_encrypted": False,
},
{
"key": "INTERCOM_APP_ID",
"value": os.environ.get("INTERCOM_APP_ID", ""),
"category": "INTERCOM",
"is_encrypted": False,
},
]

core_config_variables = [
*authentication_config_variables,
*workspace_management_config_variables,
Expand All @@ -257,5 +242,4 @@
*smtp_config_variables,
*llm_config_variables,
*unsplash_config_variables,
*intercom_config_variables,
]
13 changes: 0 additions & 13 deletions apps/web/core/components/power-k/config/help-commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,13 @@ import { FileText, GithubIcon, MessageSquare, Rocket } from "lucide-react";
import type { TPowerKCommandConfig } from "@/components/power-k/core/types";
// hooks
import { usePowerK } from "@/hooks/store/use-power-k";
import { useChatSupport } from "@/hooks/use-chat-support";

/**
* Help commands - Help related commands
*/
export const usePowerKHelpCommands = (): TPowerKCommandConfig[] => {
// store
const { toggleShortcutsListModal } = usePowerK();
const { isEnabled: isChatSupportEnabled, openChatSupport } = useChatSupport();

return [
{
Expand Down Expand Up @@ -71,16 +69,5 @@ export const usePowerKHelpCommands = (): TPowerKCommandConfig[] => {
isVisible: () => true,
closeOnSelect: true,
},
{
id: "chat_with_us",
type: "action",
group: "help",
i18n_title: "power_k.help_actions.chat_with_us",
icon: MessageSquare,
action: () => openChatSupport(),
isEnabled: () => isChatSupportEnabled,
isVisible: () => isChatSupportEnabled,
closeOnSelect: true,
},
];
};
16 changes: 1 addition & 15 deletions apps/web/core/components/workspace/sidebar/help-section/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import React, { useState } from "react";
import { observer } from "mobx-react";
import { HelpCircle, MessagesSquare, User } from "lucide-react";
import { HelpCircle, User } from "lucide-react";
import { useTranslation } from "@plane/i18n";
import { PageIcon } from "@plane/propel/icons";
// ui
Expand All @@ -16,15 +16,13 @@ import { ProductUpdatesModal } from "@/components/global";
import { AppSidebarItem } from "@/components/sidebar/sidebar-item";
// hooks
import { usePowerK } from "@/hooks/store/use-power-k";
import { useChatSupport } from "@/hooks/use-chat-support";
// plane web components
import { PlaneVersionNumber } from "@/plane-web/components/global";

export const HelpMenuRoot = observer(function HelpMenuRoot() {
// store hooks
const { t } = useTranslation();
const { toggleShortcutsListModal } = usePowerK();
const { openChatSupport, isEnabled: isChatSupportEnabled } = useChatSupport();
// states
const [isNeedHelpOpen, setIsNeedHelpOpen] = useState(false);
const [isProductUpdatesModalOpen, setProductUpdatesModalOpen] = useState(false);
Expand Down Expand Up @@ -56,18 +54,6 @@ export const HelpMenuRoot = observer(function HelpMenuRoot() {
<span className="text-11">{t("documentation")}</span>
</div>
</CustomMenu.MenuItem>
{isChatSupportEnabled && (
<CustomMenu.MenuItem>
<button
type="button"
onClick={openChatSupport}
className="flex w-full items-center gap-x-2 rounded-sm text-11 hover:bg-layer-1"
>
<MessagesSquare className="h-3.5 w-3.5 text-secondary" />
<span className="text-11">{t("message_support")}</span>
</button>
</CustomMenu.MenuItem>
)}
<CustomMenu.MenuItem onClick={() => window.open("mailto:sales@plane.so", "_blank")}>
<div className="flex items-center gap-x-2 rounded-sm text-11">
<User className="h-3.5 w-3.5 text-secondary" size={14} />
Expand Down
19 changes: 0 additions & 19 deletions apps/web/core/custom-events/chat-support.ts

This file was deleted.

31 changes: 0 additions & 31 deletions apps/web/core/hooks/use-chat-support.ts

This file was deleted.

1 change: 0 additions & 1 deletion packages/i18n/src/locales/cs/translations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,6 @@ export default {
time_tracking_description: "Zaznamenávejte čas strávený na pracovních položkách a projektech.",
work_management_description: "Spravujte svou práci a projekty snadno.",
documentation: "Dokumentace",
message_support: "Kontaktovat podporu",
contact_sales: "Kontaktovat prodej",
hyper_mode: "Hyper režim",
keyboard_shortcuts: "Klávesové zkratky",
Expand Down
1 change: 0 additions & 1 deletion packages/i18n/src/locales/de/translations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,6 @@ export default {
time_tracking_description: "Erfassen Sie die auf Arbeitselemente und Projekte verwendete Zeit.",
work_management_description: "Verwalten Sie Ihre Arbeit und Projekte mühelos.",
documentation: "Dokumentation",
message_support: "Support kontaktieren",
contact_sales: "Vertrieb kontaktieren",
hyper_mode: "Hyper-Modus",
keyboard_shortcuts: "Tastaturkürzel",
Expand Down
2 changes: 0 additions & 2 deletions packages/i18n/src/locales/en/translations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,6 @@ export default {
time_tracking_description: "Log time spent on work items and projects.",
work_management_description: "Manage your work and projects with ease.",
documentation: "Documentation",
message_support: "Message support",
contact_sales: "Contact sales",
hyper_mode: "Hyper Mode",
keyboard_shortcuts: "Keyboard shortcuts",
Expand Down Expand Up @@ -2697,7 +2696,6 @@ export default {
open_plane_documentation: "Open Plane documentation",
join_forum: "Join our Forum",
report_bug: "Report a bug",
chat_with_us: "Chat with us",
},
page_placeholders: {
default: "Type a command or search",
Expand Down
1 change: 0 additions & 1 deletion packages/i18n/src/locales/es/translations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,6 @@ export default {
time_tracking_description: "Registra el tiempo dedicado a elementos de trabajo y proyectos.",
work_management_description: "Gestiona tu trabajo y proyectos con facilidad.",
documentation: "Documentación",
message_support: "Mensaje al soporte",
contact_sales: "Contactar ventas",
hyper_mode: "Modo Hyper",
keyboard_shortcuts: "Atajos de teclado",
Expand Down
1 change: 0 additions & 1 deletion packages/i18n/src/locales/fr/translations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,6 @@ export default {
time_tracking_description: "Enregistrez le temps passé sur les éléments de travail et les projets.",
work_management_description: "Gérez votre travail et vos projets facilement.",
documentation: "Documentation",
message_support: "Contacter le support",
contact_sales: "Contacter les ventes",
hyper_mode: "Mode Hyper",
keyboard_shortcuts: "Raccourcis clavier",
Expand Down
1 change: 0 additions & 1 deletion packages/i18n/src/locales/id/translations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,6 @@ export default {
time_tracking_description: "Catat waktu yang dihabiskan untuk item kerja dan proyek.",
work_management_description: "Kelola pekerjaan dan proyek Anda dengan mudah.",
documentation: "Dokumentasi",
message_support: "Pesan dukungan",
contact_sales: "Hubungi penjualan",
hyper_mode: "Mode Hyper",
keyboard_shortcuts: "Pintasan keyboard",
Expand Down
1 change: 0 additions & 1 deletion packages/i18n/src/locales/it/translations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,6 @@ export default {
time_tracking_description: "Registra il tempo trascorso su elementi di lavoro e progetti.",
work_management_description: "Gestisci il tuo lavoro e i tuoi progetti con facilità.",
documentation: "Documentazione",
message_support: "Contatta il supporto",
contact_sales: "Contatta le vendite",
hyper_mode: "Modalità Hyper",
keyboard_shortcuts: "Scorciatoie da tastiera",
Expand Down
Loading
Loading