Skip to content
Open
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
1 change: 1 addition & 0 deletions app/client/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ module.exports = {
disableIframeWidgetSandbox: parseConfig(
"__APPSMITH_DISABLE_IFRAME_WIDGET_SANDBOX__",
),
hideHelpButton: parseConfig("__APPSMITH_HIDE_HELP_BUTTON__"),
},
},
};
1 change: 1 addition & 0 deletions app/client/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@
disableIframeWidgetSandbox: parseConfig(
'{{env "APPSMITH_DISABLE_IFRAME_WIDGET_SANDBOX"}}',
),
hideHelpButton: parseConfig('{{env "APPSMITH_HIDE_HELP_BUTTON"}}'),
customerPortalUrl:
parseConfig('{{env "APPSMITH_CUSTOMER_PORTAL_URL"}}') ||
"https://customer.appsmith.com",
Expand Down
8 changes: 8 additions & 0 deletions app/client/src/ce/configs/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ export interface INJECTED_CONFIGS {
googleRecaptchaSiteKey: string;
supportEmail: string;
disableIframeWidgetSandbox: boolean;
hideHelpButton: boolean;
pricingUrl: string;
customerPortalUrl: string;
}
Expand Down Expand Up @@ -132,6 +133,9 @@ export const getConfigsFromEnvVars = (): INJECTED_CONFIGS => {
.APPSMITH_DISABLE_IFRAME_WIDGET_SANDBOX
? process.env.APPSMITH_DISABLE_IFRAME_WIDGET_SANDBOX.length > 0
: false,
hideHelpButton: process.env.APPSMITH_HIDE_HELP_BUTTON
? process.env.APPSMITH_HIDE_HELP_BUTTON.length > 0
: false,
pricingUrl: process.env.REACT_APP_PRICING_URL || "",
customerPortalUrl: process.env.REACT_APP_CUSTOMER_PORTAL_URL || "",
};
Expand Down Expand Up @@ -276,6 +280,10 @@ export const getAppsmithConfigs = (): AppsmithUIConfigs => {
ENV_CONFIG.disableIframeWidgetSandbox ||
APPSMITH_FEATURE_CONFIGS?.disableIframeWidgetSandbox ||
false,
hideHelpButton:
ENV_CONFIG.hideHelpButton ||
APPSMITH_FEATURE_CONFIGS?.hideHelpButton ||
false,
pricingUrl:
ENV_CONFIG.pricingUrl || APPSMITH_FEATURE_CONFIGS?.pricingUrl || "",
customerPortalUrl:
Expand Down
1 change: 1 addition & 0 deletions app/client/src/ce/configs/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ export interface AppsmithUIConfigs {
};
appsmithSupportEmail: string;
disableIframeWidgetSandbox: boolean;
hideHelpButton: boolean;
pricingUrl: string;
customerPortalUrl: string;
}
Expand Down
5 changes: 4 additions & 1 deletion app/client/src/pages/Editor/HelpButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ import BetterbugsUtil from "utils/Analytics/betterbugs";
import { isAirgapped } from "ee/utils/airgapHelpers";
import { useBetterbugsMetadata } from "utils/hooks/useBetterbugsMetadata";

const { appVersion, betterbugs, cloudHosting } = getAppsmithConfigs();
const { appVersion, betterbugs, cloudHosting, hideHelpButton } =
getAppsmithConfigs();

const HelpFooter = styled.div`
display: flex;
Expand Down Expand Up @@ -227,6 +228,8 @@ function HelpButton() {
bootPylon(user);
}, [user?.email, user?.emailVerificationHash, user?.name, user?.username]);

if (hideHelpButton) return null;

return (
<Menu
onOpenChange={(open) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ const HomepageHeaderAction = ({
);
const isHomePage = useRouteMatch("/applications")?.isExact;
const isAirgappedInstance = isAirgapped();
const { appVersion } = getAppsmithConfigs();
const { appVersion, hideHelpButton } = getAppsmithConfigs();
const howMuchTimeBefore = howMuchTimeBeforeText(appVersion.releaseDate);
const [showIntercomConsent, setShowIntercomConsent] = useState(false);
const isAiAgentInstanceEnabled = useSelector(getIsAiAgentInstanceEnabled);
Expand Down Expand Up @@ -104,7 +104,7 @@ const HomepageHeaderAction = ({
/>
</Tooltip>
)}
{!isAirgappedInstance && (
{!isAirgappedInstance && !hideHelpButton && (
<Menu
onOpenChange={(open) => {
if (open) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public enum EnvVariables {
APPSMITH_CUSTOM_DOMAIN,
APPSMITH_ALLOWED_FRAME_ANCESTORS,
APPSMITH_DISABLE_IFRAME_WIDGET_SANDBOX,
APPSMITH_HIDE_HELP_BUTTON,
APPSMITH_NEW_RELIC_ACCOUNT_ENABLE,
APPSMITH_VERBOSE_LOGGING_ENABLED
}
4 changes: 4 additions & 0 deletions deploy/docker/fs/opt/appsmith/templates/docker.env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,8 @@ APPSMITH_ALLOWED_FRAME_ANCESTORS="'self' *"

APPSMITH_DISABLE_IFRAME_WIDGET_SANDBOX=false

# Set this to true to hide the help/support button (the "?" menu with documentation,
# chat and support options) on the home page and in the app editor.
APPSMITH_HIDE_HELP_BUTTON=false

EOF
2 changes: 1 addition & 1 deletion deploy/helm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ for prerequisites, step-by-step setup, and platform-specific instructions (EKS,
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| secretName | string | `""` | Name of an existing Secret for APPSMITH_* env vars (empty = chart creates one) |
| applicationConfig | object | `{"APPSMITH_CLIENT_LOG_LEVEL":"","APPSMITH_CUSTOM_DOMAIN":"","APPSMITH_DB_URL":"","APPSMITH_DISABLE_IFRAME_WIDGET_SANDBOX":"false","APPSMITH_DISABLE_TELEMETRY":"","APPSMITH_ENCRYPTION_PASSWORD":"","APPSMITH_ENCRYPTION_SALT":"","APPSMITH_FORM_LOGIN_DISABLED":"","APPSMITH_KEYCLOAK_DB_DRIVER":"","APPSMITH_KEYCLOAK_DB_PASSWORD":"","APPSMITH_KEYCLOAK_DB_URL":"","APPSMITH_KEYCLOAK_DB_USERNAME":"","APPSMITH_LICENSE_KEY":"","APPSMITH_MAIL_ENABLED":"","APPSMITH_MAIL_FROM":"","APPSMITH_MAIL_HOST":"","APPSMITH_MAIL_PASSWORD":"","APPSMITH_MAIL_PORT":"","APPSMITH_MAIL_SMTP_AUTH":"","APPSMITH_MAIL_SMTP_TLS_ENABLED":"","APPSMITH_MAIL_USERNAME":"","APPSMITH_OAUTH2_GITHUB_CLIENT_ID":"","APPSMITH_OAUTH2_GITHUB_CLIENT_SECRET":"","APPSMITH_OAUTH2_GOOGLE_CLIENT_ID":"","APPSMITH_OAUTH2_GOOGLE_CLIENT_SECRET":"","APPSMITH_RECAPTCHA_ENABLED":"","APPSMITH_RECAPTCHA_SECRET_KEY":"","APPSMITH_RECAPTCHA_SITE_KEY":"","APPSMITH_REDIS_URL":"","APPSMITH_REPLY_TO":"","APPSMITH_SIGNUP_DISABLED":""}` | Map of APPSMITH_* environment variables for the application container |
| applicationConfig | object | `{"APPSMITH_CLIENT_LOG_LEVEL":"","APPSMITH_CUSTOM_DOMAIN":"","APPSMITH_DB_URL":"","APPSMITH_DISABLE_IFRAME_WIDGET_SANDBOX":"false","APPSMITH_DISABLE_TELEMETRY":"","APPSMITH_ENCRYPTION_PASSWORD":"","APPSMITH_ENCRYPTION_SALT":"","APPSMITH_FORM_LOGIN_DISABLED":"","APPSMITH_HIDE_HELP_BUTTON":"false","APPSMITH_KEYCLOAK_DB_DRIVER":"","APPSMITH_KEYCLOAK_DB_PASSWORD":"","APPSMITH_KEYCLOAK_DB_URL":"","APPSMITH_KEYCLOAK_DB_USERNAME":"","APPSMITH_LICENSE_KEY":"","APPSMITH_MAIL_ENABLED":"","APPSMITH_MAIL_FROM":"","APPSMITH_MAIL_HOST":"","APPSMITH_MAIL_PASSWORD":"","APPSMITH_MAIL_PORT":"","APPSMITH_MAIL_SMTP_AUTH":"","APPSMITH_MAIL_SMTP_TLS_ENABLED":"","APPSMITH_MAIL_USERNAME":"","APPSMITH_OAUTH2_GITHUB_CLIENT_ID":"","APPSMITH_OAUTH2_GITHUB_CLIENT_SECRET":"","APPSMITH_OAUTH2_GOOGLE_CLIENT_ID":"","APPSMITH_OAUTH2_GOOGLE_CLIENT_SECRET":"","APPSMITH_RECAPTCHA_ENABLED":"","APPSMITH_RECAPTCHA_SECRET_KEY":"","APPSMITH_RECAPTCHA_SITE_KEY":"","APPSMITH_REDIS_URL":"","APPSMITH_REPLY_TO":"","APPSMITH_SIGNUP_DISABLED":""}` | Map of APPSMITH_* environment variables for the application container |
| image | object | `{"pullPolicy":"IfNotPresent","pullSecrets":"","registry":"index.docker.io","repository":"appsmith/appsmith-ee","tag":"latest"}` | Appsmith container image configuration |
| _image | object | `{}` | DEPRECATED: use image instead. Backwards-compatible override merged on top of image. |

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
APPSMITH_DB_URL: |
mongodb+srv://root:password@appsmith-mongodb.NAMESPACE.svc.cluster.local/appsmith?retryWrites=true&authSource=admin&ssl=false
APPSMITH_DISABLE_IFRAME_WIDGET_SANDBOX: "false"
APPSMITH_HIDE_HELP_BUTTON: "false"
APPSMITH_KEYCLOAK_DB_DRIVER: postgresql
APPSMITH_KEYCLOAK_DB_PASSWORD: password
APPSMITH_KEYCLOAK_DB_URL: RELEASE-NAME-postgresql.NAMESPACE.svc.cluster.local:5432/keycloak
Expand Down
2 changes: 2 additions & 0 deletions deploy/helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ applicationConfig: # @schema additionalProperties: {type: [string, boolean, inte
# @schema hidden: true
APPSMITH_DISABLE_IFRAME_WIDGET_SANDBOX: "false"
# @schema hidden: true
APPSMITH_HIDE_HELP_BUTTON: "false"
# @schema hidden: true
APPSMITH_LICENSE_KEY: ""
# @schema hidden: true
APPSMITH_KEYCLOAK_DB_DRIVER: ""
Expand Down
Loading