next/support: on ticket page, if you need further help or ticketing is not configured, show help email, not the organizations email

Author: haraldschilly

src/packages/next/components/landing/contact.tsx

@@ -3,21 +3,27 @@
  *  License: AGPLv3 s.t. "Commons Clause" – see LICENSE.md for details
  */
 
-import { useCustomize } from "lib/customize";
 import A from "components/misc/A";
+import { useCustomize } from "lib/customize";
 
 export default function Contact({
   lower,
   showEmail = true,
+  useHelpEmail = false,
 }: {
   lower?: boolean;
   showEmail?: boolean;
+  useHelpEmail?: boolean;
 }) {
-  const { contactEmail } = useCustomize();
-  if (!contactEmail) return <span>{lower ? "c" : "C"}ontact your site administrator</span>
+  const { contactEmail, helpEmail } = useCustomize();
+
+  const email = useHelpEmail ? helpEmail : contactEmail;
+
+  if (!email)
+    return <span>{lower ? "c" : "C"}ontact your site administrator</span>;
   return (
-    <A href={"mailto:" + contactEmail}>
-      {lower ? "c" : "C"}ontact {showEmail && contactEmail }
+    <A href={"mailto:" + email}>
+      {lower ? "c" : "C"}ontact {showEmail ? email : ""}
     </A>
   );
 }

src/packages/next/components/support/create.tsx

@@ -10,11 +10,14 @@ import {
 } from "antd";
 import { useRouter } from "next/router";
 import { ReactNode, useRef, useState } from "react";
-import CodeMirror from "components/share/codemirror";
+
 import { Icon } from "@cocalc/frontend/components/icon";
 import { is_valid_email_address as isValidEmailAddress } from "@cocalc/util/misc";
 import { COLORS } from "@cocalc/util/theme";
+import { Paragraph, Title } from "components/misc";
 import A from "components/misc/A";
+import ChatGPTHelp from "components/openai/chatgpt-help";
+import CodeMirror from "components/share/codemirror";
 import Loading from "components/share/loading";
 import SiteName from "components/share/site-name";
 import apiPost from "lib/api/post";
@@ -24,8 +27,6 @@ import getBrowserInfo from "./browser-info";
 import RecentFiles from "./recent-files";
 import { Type } from "./tickets";
 import { NoZendesk } from "./util";
-import { Paragraph, Title } from "components/misc";
-import ChatGPTHelp from "components/openai/chatgpt-help";
 
 const CHATGPT_DISABLED = true;
 const MIN_BODY_LENGTH = 16;
@@ -47,7 +48,7 @@ function stringToType(s?: any): Type {
 }
 
 export default function Create() {
-  const { contactEmail, zendesk, account, openaiEnabled, siteName } =
+  const { helpEmail, zendesk, account, openaiEnabled, siteName } =
     useCustomize();
   const router = useRouter();
   // The URL the user was viewing when they requested support.
@@ -140,12 +141,12 @@ export default function Create() {
                 check the status of your support tickets
               </A>
               .{" "}
-              {contactEmail && (
+              {helpEmail ? (
                 <>
                   You can also email us directly at{" "}
-                  <A href={`mailto:${contactEmail}`}>{contactEmail}</A>.
+                  <A href={`mailto:${helpEmail}`}>{helpEmail}</A>.
                 </>
-              )}
+              ) : undefined}
             </p>
             {openaiEnabled && !CHATGPT_DISABLED && (
               <ChatGPT siteName={siteName} />
@@ -283,12 +284,12 @@ export default function Create() {
                   style={{ margin: "15px auto", maxWidth: "500px" }}
                 />
                 <br />
-                {contactEmail && (
+                {helpEmail ? (
                   <>
                     If you continue to have problems, email us directly at{" "}
-                    <A href={`mailto:${contactEmail}`}>{contactEmail}</A>.
+                    <A href={`mailto:${helpEmail}`}>{helpEmail}</A>.
                   </>
-                )}
+                ) : undefined}
               </div>
             )}
             {success && (

src/packages/next/components/support/util.tsx

@@ -1,4 +1,5 @@
 import { Alert } from "antd";
+
 import Contact from "components/landing/contact";
 import { useCustomize } from "lib/customize";
 
@@ -8,12 +9,12 @@ export function NoZendesk() {
   return (
     <Alert
       type="error"
-      message="Zendesk Support is not configured."
+      message="Support system is not configured."
       style={{ margin: "30px auto", maxWidth: "400px", fontSize: "13pt" }}
       description={
         contactEmail && (
           <>
-            You can still <Contact lower />.
+            You can still <Contact lower useHelpEmail />.
           </>
         )
       }