Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat: remove cloudHosting conditional check, change version name (#28086)

Browse Source
This commit is contained in:
Dipyaman Biswas 2023-10-15 02:11:29 +05:30 committed by GitHub
parent 6ddcf72efb
commit 0b9857d44f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/client/src/ce/constants/messages.ts
View File

@ -8,15 +8,10 @@ export function createMessage(
} }
/* /*
For self hosted, it displays the string "Appsmith Community v1.10.0" or "Appsmith Business v1.10.0". For self hosted CE, it displays the string "Appsmith Community v1.10.0".
For cloud hosting, it displays "Appsmith v1.10.0".
This is because Appsmith Cloud doesn't support business features yet.
*/ */
export const APPSMITH_DISPLAY_VERSION = ( export const APPSMITH_DISPLAY_VERSION = (edition: string, version: string) =>
edition: string, `Appsmith ${edition} ${version}`;
version: string,
cloudHosting: boolean,
) => `Appsmith ${!cloudHosting ? edition : ""} ${version}`;
export const INTERCOM_CONSENT_MESSAGE = () => export const INTERCOM_CONSENT_MESSAGE = () =>
`Can we have your email for better support?`; `Can we have your email for better support?`;
export const YES = () => `Yes`; export const YES = () => `Yes`;

3
app/client/src/ce/sagas/SuperUserSagas.tsx
View File

@ -38,7 +38,7 @@ export function* FetchAdminSettingsSaga() {
const isValidResponse: boolean = yield validateResponse(response); const isValidResponse: boolean = yield validateResponse(response);
if (isValidResponse) { if (isValidResponse) {
const { appVersion, cloudHosting } = getAppsmithConfigs(); const { appVersion } = getAppsmithConfigs();
const settings = { const settings = {
//@ts-expect-error: response is of type unknown //@ts-expect-error: response is of type unknown
...response.data, ...response.data,
@ -46,7 +46,6 @@ export function* FetchAdminSettingsSaga() {
APPSMITH_DISPLAY_VERSION, APPSMITH_DISPLAY_VERSION,
appVersion.edition, appVersion.edition,
appVersion.id, appVersion.id,
cloudHosting,
), ),
}; };

3
app/client/src/pages/Editor/FirstTimeUserOnboarding/HelpMenu.tsx
View File

@ -78,7 +78,7 @@ function HelpMenu(props: {
> >
Help & Resources Help & Resources
</Text> </Text>
<div className="flex gap-2 flex-wrap mt-2"> <div className="flex flex-wrap gap-2 mt-2">
<Button <Button
data-testid="editor-welcome-tour" data-testid="editor-welcome-tour"
kind="secondary" kind="secondary"
@ -126,7 +126,6 @@ function HelpMenu(props: {
APPSMITH_DISPLAY_VERSION, APPSMITH_DISPLAY_VERSION,
appVersion.edition, appVersion.edition,
appVersion.id, appVersion.id,
cloudHosting,
)} )}
</StyledText> </StyledText>
<StyledText color="var(--ads-v2-color-fg-muted)" kind={"action-s"}> <StyledText color="var(--ads-v2-color-fg-muted)" kind={"action-s"}>

1
app/client/src/pages/Editor/HelpButton.tsx
View File

@ -299,7 +299,6 @@ function HelpButton() {
APPSMITH_DISPLAY_VERSION, APPSMITH_DISPLAY_VERSION,
appVersion.edition, appVersion.edition,
appVersion.id, appVersion.id,
cloudHosting,
)} )}
</span> </span>
<span> <span>

3
app/client/src/pages/Home/LeftPaneBottomSection.tsx
View File

@ -62,7 +62,7 @@ function LeftPaneBottomSection() {
const dispatch = useDispatch(); const dispatch = useDispatch();
const onboardingWorkspaces = useSelector(getOnboardingWorkspaces); const onboardingWorkspaces = useSelector(getOnboardingWorkspaces);
const isFetchingApplications = useSelector(getIsFetchingApplications); const isFetchingApplications = useSelector(getIsFetchingApplications);
const { appVersion, cloudHosting } = getAppsmithConfigs(); const { appVersion } = getAppsmithConfigs();
const howMuchTimeBefore = howMuchTimeBeforeText(appVersion.releaseDate); const howMuchTimeBefore = howMuchTimeBeforeText(appVersion.releaseDate);
const user = useSelector(getCurrentUser); const user = useSelector(getCurrentUser);
const tenantPermissions = useSelector(getTenantPermissions); const tenantPermissions = useSelector(getTenantPermissions);
@ -141,7 +141,6 @@ function LeftPaneBottomSection() {
APPSMITH_DISPLAY_VERSION, APPSMITH_DISPLAY_VERSION,
appVersion.edition, appVersion.edition,
appVersion.id, appVersion.id,
cloudHosting,
)} )}
</span> </span>
{howMuchTimeBefore !== "" && ( {howMuchTimeBefore !== "" && (

3
app/client/src/pages/common/MobileSidebar.tsx
View File

@ -86,7 +86,7 @@ const LeftPaneVersionData = styled.div`
export default function MobileSideBar(props: MobileSideBarProps) { export default function MobileSideBar(props: MobileSideBarProps) {
const user = useSelector(getCurrentUser); const user = useSelector(getCurrentUser);
const tenantPermissions = useSelector(getTenantPermissions); const tenantPermissions = useSelector(getTenantPermissions);
const { appVersion, cloudHosting } = getAppsmithConfigs(); const { appVersion } = getAppsmithConfigs();
const howMuchTimeBefore = howMuchTimeBeforeText(appVersion.releaseDate); const howMuchTimeBefore = howMuchTimeBeforeText(appVersion.releaseDate);
const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled); const isFeatureEnabled = useFeatureFlag(FEATURE_FLAG.license_gac_enabled);
@ -156,7 +156,6 @@ export default function MobileSideBar(props: MobileSideBarProps) {
APPSMITH_DISPLAY_VERSION, APPSMITH_DISPLAY_VERSION,
appVersion.edition, appVersion.edition,
appVersion.id, appVersion.id,
cloudHosting,
)} )}
</span> </span>
{howMuchTimeBefore !== "" && ( {howMuchTimeBefore !== "" && (