Skip to content

Daily Promotion - 21/08 #41186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
btsgh merged 2 commits into from
Aug 21, 2025
Merged

Daily Promotion - 21/08 #41186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72c47ee
fix: Removing a line of code to fix extra space issue on Page with Fi…
ankitakinger Aug 20, 2025
ae2f286
feat: update environment switch tooltip from business to enterprise p…
jacquesikot Aug 20, 2025
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/src/ce/components/DSDataFilter/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ export function DSDataFilter({
const rampLinkSelector = getRampLink({
section: RampSection.DSEditor,
feature: RampFeature.MultipleEnv,
isBusinessFeature: false,
});
const rampLink = useSelector(rampLinkSelector);

Expand Down
5 changes: 3 additions & 2 deletions app/client/src/ce/components/SwitchEnvironment/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import styled from "styled-components";
import { Icon, Link, Option, Select, Text, Tooltip } from "@appsmith/ads";
import { capitalizeFirstLetter } from "utils/helpers";
import {
BUSINESS_EDITION_TEXT,
ENTERPRISE_EDITION_TEXT,
SWITCH_ENV_DISABLED_TOOLTIP_TEXT,
createMessage,
} from "ee/constants/messages";
Expand Down Expand Up @@ -68,7 +68,7 @@ export const DisabledTooltipContent = (rampLink: string) => {
>
{createMessage(SWITCH_ENV_DISABLED_TOOLTIP_TEXT)}
<TooltipLink kind="primary" target="_blank" to={rampLink}>
{createMessage(BUSINESS_EDITION_TEXT)}
{createMessage(ENTERPRISE_EDITION_TEXT)}
</TooltipLink>
</Text>
);
Expand All @@ -83,6 +83,7 @@ export default function SwitchEnvironment({}: Props) {
const rampLinkSelector = getRampLink({
section: RampSection.BottomBarEnvSwitcher,
feature: RampFeature.MultipleEnv,
isBusinessFeature: false,
});
const rampLink = useSelector(rampLinkSelector);

Expand Down
1 change: 1 addition & 0 deletions app/client/src/ce/constants/messages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ export const USERS_HAVE_ACCESS_TO_ONLY_THIS_APP = () =>
"Users will only have access to this application";
export const NO_USERS_INVITED = () => "You haven't invited any users yet";
export const BUSINESS_EDITION_TEXT = () => "business plan";
export const ENTERPRISE_EDITION_TEXT = () => "enterprise plan";
export const PARTNER_PROGRAM_CALLOUT = (
email: string,
) => `${email} is outside your organisation. If you’re building this app
Expand Down
4 changes: 0 additions & 4 deletions app/client/src/sagas/autoHeightSagas/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,10 +204,6 @@ export function* getMinHeightBasedOnChildren(
}
}

if (widgetId === MAIN_CONTAINER_WIDGET_ID) {
return minHeightInRows + GridDefaults.MAIN_CANVAS_EXTENSION_OFFSET;
}

return minHeightInRows;
}
/**
Expand Down
Loading